aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/test_auth.py
diff options
context:
space:
mode:
authorAditi <aditi.iitr@gmail.com>2013-07-16 06:48:33 +0530
committerAditi <aditi.iitr@gmail.com>2013-07-16 06:48:33 +0530
commit67d303ffa96a80da3a3cf48d2f9231bc1a087a19 (patch)
tree8bd1af9ec13fed7c340a6329632bddf2d17e3fb6 /mediagoblin/tests/test_auth.py
parent7b77f7e490a27de57a4dab5301662ef95d11b213 (diff)
parent64ad0beea83b1f4b50462bcb67c54156fc9365a5 (diff)
downloadmediagoblin-67d303ffa96a80da3a3cf48d2f9231bc1a087a19.tar.lz
mediagoblin-67d303ffa96a80da3a3cf48d2f9231bc1a087a19.tar.xz
mediagoblin-67d303ffa96a80da3a3cf48d2f9231bc1a087a19.zip
merge with remote master branch of cweb.
Diffstat (limited to 'mediagoblin/tests/test_auth.py')
-rw-r--r--mediagoblin/tests/test_auth.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index 5bd8bf2c..61503d32 100644
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@@ -93,8 +93,8 @@ def test_register_views(test_app):
assert 'mediagoblin/user_pages/user.html' in template.TEMPLATE_TEST_CONTEXT
## Make sure user is in place
- new_user = mg_globals.database.User.find_one(
- {'username': u'happygirl'})
+ new_user = mg_globals.database.User.query.filter_by(
+ username=u'happygirl').first()
assert new_user
assert new_user.status == u'needs_email_verification'
assert new_user.email_verified == False
@@ -128,8 +128,8 @@ def test_register_views(test_app):
# assert context['verification_successful'] == True
# TODO: Would be good to test messages here when we can do so...
- new_user = mg_globals.database.User.find_one(
- {'username': u'happygirl'})
+ new_user = mg_globals.database.User.query.filter_by(
+ username=u'happygirl').first()
assert new_user
assert new_user.status == u'needs_email_verification'
assert new_user.email_verified == False
@@ -142,8 +142,8 @@ def test_register_views(test_app):
'mediagoblin/user_pages/user.html']
# assert context['verification_successful'] == True
# TODO: Would be good to test messages here when we can do so...
- new_user = mg_globals.database.User.find_one(
- {'username': u'happygirl'})
+ new_user = mg_globals.database.User.query.filter_by(
+ username=u'happygirl').first()
assert new_user
assert new_user.status == u'active'
assert new_user.email_verified == True