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
This commit is contained in:
parent
cfe46f3e68
commit
e054ae9b3d
@ -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):
|
||||
|
@ -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'})
|
||||
|
Loading…
x
Reference in New Issue
Block a user