Change codebase to query or create correct User model

The code base had many references to User.username and other
specific to LocalUser attributes as that was the way it use to exist.
This updates those to query on the generic User model but filtering
by attributes on the LocalUser.

1 files changed, 10 insertions, 7 deletions

diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index 5ce67688..b731ce52 100644
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@@ -23,7 +23,7 @@ import six
 import six.moves.urllib.parse as urlparse
 
 from mediagoblin import mg_globals
-from mediagoblin.db.models import User
+from mediagoblin.db.models import User, LocalUser
 from mediagoblin.tests.tools import get_app, fixture_add_user
 from mediagoblin.tools import template, mail
 from mediagoblin.auth import tools as auth_tools
@@ -98,8 +98,9 @@ def test_register_views(test_app):
     assert 'mediagoblin/user_pages/user_nonactive.html' in template.TEMPLATE_TEST_CONTEXT
 
     ## Make sure user is in place
-    new_user = mg_globals.database.User.query.filter_by(
-        username=u'angrygirl').first()
+    new_user = mg_globals.database.User.query.filter(
+        LocalUser.usrname==u'angrygirl'
+    ).first()
     assert new_user
 
     ## Make sure that the proper privileges are granted on registration
@@ -137,8 +138,9 @@ 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.query.filter_by(
-        username=u'angrygirl').first()
+    new_user = mg_globals.database.User.query.filter(
+        LocalUser.username==u'angrygirl'
+    ).first()
     assert new_user
 
     ## Verify the email activation works
@@ -149,8 +151,9 @@ 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.query.filter_by(
-        username=u'angrygirl').first()
+    new_user = mg_globals.database.User.query.filter(
+        LocalUser.username==u'angrygirl'
+    ).first()
     assert new_user
 
     # Uniqueness checks