heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into test_submission_views_365

Browse Source
This commit is contained in:
Chris Moylan
2011-07-10 22:45:52 -05:00
parent 9df37e8a4a 3054e2b3cb
commit 3d073d48cb
37 changed files with 316 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mediagoblin/tests/test_auth.py
View File

@@ -189,7 +189,7 @@ def test_register_views(test_app):
"/auth/verify_email/?userid=%s&token=total_bs" % unicode(
new_user['_id']))
context = util.TEMPLATE_TEST_CONTEXT[
'mediagoblin/auth/verify_email.html']
'mediagoblin/user_pages/user.html']
assert context['verification_successful'] == False
new_user = mg_globals.database.User.find_one(
{'username': 'happygirl'})
@@ -201,7 +201,7 @@ def test_register_views(test_app):
util.clear_test_template_context()
test_app.get("%s?%s" % (path, get_params))
context = util.TEMPLATE_TEST_CONTEXT[
'mediagoblin/auth/verify_email.html']
'mediagoblin/user_pages/user.html']
assert context['verification_successful'] == True
new_user = mg_globals.database.User.find_one(
{'username': 'happygirl'})