heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allows using messaging instead of verify_email.html to pass tests

Browse Source 
* re-instated verification_successful flag
* modified test_auth to verify nav to user_pages/user.html template
This commit is contained in:
Caleb Forbes Davis V 2011-07-04 20:04:00 -05:00
parent cfe46f3e68
commit e054ae9b3d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mediagoblin/auth/views.py
View File

@ -126,11 +126,13 @@ def verify_email(request):
user['status'] = u'active' user['status'] = u'active'
user['email_verified'] = True user['email_verified'] = True
user.save() user.save()
verification_successful = True
messages.add_message(request, messages.add_message(request,
messages.SUCCESS, messages.SUCCESS,
'Your email address has been verified. ' \ 'Your email address has been verified. ' \
'You may now login!') 'You may now login!')
else: else:
verification_successful = False
messages.add_message(request, messages.add_message(request,
messages.ERROR, messages.ERROR,
'The verification key or user id is incorrect') 'The verification key or user id is incorrect')
@ -138,7 +140,8 @@ def verify_email(request):
return render_to_response( return render_to_response(
request, request,
'mediagoblin/user_pages/user.html', 'mediagoblin/user_pages/user.html',
{'user': user}) {'user': user,
'verification_successful' : verification_successful})
def resend_activation(request): def resend_activation(request):

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