aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/test_edit.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_edit.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_edit.py')
-rw-r--r--mediagoblin/tests/test_edit.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/tests/test_edit.py b/mediagoblin/tests/test_edit.py
index acc638d9..d70d0478 100644
--- a/mediagoblin/tests/test_edit.py
+++ b/mediagoblin/tests/test_edit.py
@@ -190,8 +190,8 @@ class TestUserEdit(object):
assert urlparse.urlsplit(res.location)[2] == '/'
# Email shouldn't be saved
- email_in_db = mg_globals.database.User.find_one(
- {'email': 'new@example.com'})
+ email_in_db = mg_globals.database.User.query.filter_by(
+ email='new@example.com').first()
email = User.query.filter_by(username='chris').first().email
assert email_in_db is None
assert email == 'chris@example.com'