diff options
| author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-15 23:25:47 +0200 |
|---|---|---|
| committer | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-15 23:25:47 +0200 |
| commit | bb770e295cd727429df524b0a5c3952ea449fdb2 (patch) | |
| tree | e8a894c2a75e7ff53946b05508f82b501c37189e /mediagoblin/tests/test_auth.py | |
| parent | bb10e5bef7ae062424b4c334a73c4ce988e37ccf (diff) | |
| parent | 0e9dd2a28669a4d42c4a3828dbd047937acd776c (diff) | |
| download | mediagoblin-bb770e295cd727429df524b0a5c3952ea449fdb2.tar.lz mediagoblin-bb770e295cd727429df524b0a5c3952ea449fdb2.tar.xz mediagoblin-bb770e295cd727429df524b0a5c3952ea449fdb2.zip | |
Merge remote-tracking branch 'gitorious/master'
Diffstat (limited to 'mediagoblin/tests/test_auth.py')
| -rw-r--r-- | mediagoblin/tests/test_auth.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py index cdfeccab..3d569093 100644 --- a/mediagoblin/tests/test_auth.py +++ b/mediagoblin/tests/test_auth.py @@ -20,7 +20,7 @@ from nose.tools import assert_equal from mediagoblin.auth import lib as auth_lib from mediagoblin.tests.tools import setup_fresh_app -from mediagoblin import globals as mgoblin_globals +from mediagoblin import mg_globals from mediagoblin import util @@ -137,7 +137,7 @@ def test_register_views(test_app): u'Passwords must match.'] ## At this point there should be no users in the database ;) - assert not mgoblin_globals.database.User.find().count() + assert not mg_globals.database.User.find().count() # Successful register # ------------------- @@ -158,7 +158,7 @@ def test_register_views(test_app): 'mediagoblin/auth/register_success.html') ## Make sure user is in place - new_user = mgoblin_globals.database.User.find_one( + new_user = mg_globals.database.User.find_one( {'username': 'happygirl'}) assert new_user assert new_user['status'] == u'needs_email_verification' @@ -191,7 +191,7 @@ def test_register_views(test_app): context = util.TEMPLATE_TEST_CONTEXT[ 'mediagoblin/auth/verify_email.html'] assert context['verification_successful'] == False - new_user = mgoblin_globals.database.User.find_one( + new_user = mg_globals.database.User.find_one( {'username': 'happygirl'}) assert new_user assert new_user['status'] == u'needs_email_verification' @@ -203,7 +203,7 @@ def test_register_views(test_app): context = util.TEMPLATE_TEST_CONTEXT[ 'mediagoblin/auth/verify_email.html'] assert context['verification_successful'] == True - new_user = mgoblin_globals.database.User.find_one( + new_user = mg_globals.database.User.find_one( {'username': 'happygirl'}) assert new_user assert new_user['status'] == u'active' |