diff options
| author | xray7224 <xray7224@googlemail.com> | 2013-07-14 15:27:52 +0100 |
|---|---|---|
| committer | xray7224 <xray7224@googlemail.com> | 2013-07-14 15:27:52 +0100 |
| commit | e49263564b0ee8859c43e2716fcedab6e80bf164 (patch) | |
| tree | 37411b19738484cbba814e584b8d3547d3a2ded0 /mediagoblin/tests/test_openid.py | |
| parent | 49a47ec991152a5dd25a7460e1d3d11afb73d32d (diff) | |
| parent | 2d0028e93283fea397133294a5eb45b67d5ed0ab (diff) | |
| download | mediagoblin-e49263564b0ee8859c43e2716fcedab6e80bf164.tar.lz mediagoblin-e49263564b0ee8859c43e2716fcedab6e80bf164.tar.xz mediagoblin-e49263564b0ee8859c43e2716fcedab6e80bf164.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/tests/test_openid.py')
| -rw-r--r-- | mediagoblin/tests/test_openid.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mediagoblin/tests/test_openid.py b/mediagoblin/tests/test_openid.py index c85f6318..bba46db8 100644 --- a/mediagoblin/tests/test_openid.py +++ b/mediagoblin/tests/test_openid.py @@ -186,8 +186,8 @@ class TestOpenIDPlugin(object): openid_plugin_app.get('/auth/logout') # Get user and detach from session - test_user = mg_globals.database.User.find_one({ - 'username': u'chris'}) + test_user = mg_globals.database.User.query.filter_by( + username=u'chris').first() Session.expunge(test_user) # Log back in @@ -314,8 +314,8 @@ class TestOpenIDPlugin(object): assert 'mediagoblin/edit/edit_account.html' in template.TEMPLATE_TEST_CONTEXT # OpenID Added? - new_openid = mg_globals.database.OpenIDUserURL.find_one( - {'openid_url': u'http://add.myopenid.com'}) + new_openid = mg_globals.database.OpenIDUserURL.query.filter_by( + openid_url=u'http://add.myopenid.com').first() assert new_openid _test_add() @@ -365,8 +365,8 @@ class TestOpenIDPlugin(object): assert 'mediagoblin/edit/edit_account.html' in template.TEMPLATE_TEST_CONTEXT # OpenID deleted? - new_openid = mg_globals.database.OpenIDUserURL.find_one( - {'openid_url': u'http://add.myopenid.com'}) + new_openid = mg_globals.database.OpenIDUserURL.query.filter_by( + openid_url=u'http://add.myopenid.com').first() assert not new_openid _test_delete(self, test_user) |