diff options
| author | Caleb Forbes Davis V <caldavis@gmail.com> | 2011-07-04 20:04:00 -0500 |
|---|---|---|
| committer | Caleb Forbes Davis V <caldavis@gmail.com> | 2011-07-04 20:04:00 -0500 |
| commit | e054ae9b3dfc518a34eb4a7395b177f0e8a31469 (patch) | |
| tree | 274f1a4fc3572277424dfd60d2b6df021f72347c | |
| parent | cfe46f3e68b62bba0cfb943dc45e9b88c3f7c25e (diff) | |
| download | mediagoblin-e054ae9b3dfc518a34eb4a7395b177f0e8a31469.tar.lz mediagoblin-e054ae9b3dfc518a34eb4a7395b177f0e8a31469.tar.xz mediagoblin-e054ae9b3dfc518a34eb4a7395b177f0e8a31469.zip | |
allows using messaging instead of verify_email.html to pass tests
* re-instated verification_successful flag
* modified test_auth to verify nav to user_pages/user.html template
| -rw-r--r-- | mediagoblin/auth/views.py | 5 | ||||
| -rw-r--r-- | mediagoblin/tests/test_auth.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py index 435ad803..47707ca5 100644 --- a/mediagoblin/auth/views.py +++ b/mediagoblin/auth/views.py @@ -126,11 +126,13 @@ def verify_email(request): user['status'] = u'active' user['email_verified'] = True user.save() + verification_successful = True messages.add_message(request, messages.SUCCESS, 'Your email address has been verified. ' \ 'You may now login!') else: + verification_successful = False messages.add_message(request, messages.ERROR, 'The verification key or user id is incorrect') @@ -138,7 +140,8 @@ def verify_email(request): return render_to_response( request, 'mediagoblin/user_pages/user.html', - {'user': user}) + {'user': user, + 'verification_successful' : verification_successful}) def resend_activation(request): diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py index 3a13cbb1..ad9dd35b 100644 --- a/mediagoblin/tests/test_auth.py +++ b/mediagoblin/tests/test_auth.py @@ -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'}) |