5 files changed, 7 insertions, 6 deletions
diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
index 0832f0db..2c9b5e99 100644
--- a/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@ -19,7 +19,7 @@ import wtforms
 from mediagoblin.tools.text import tag_length_validator
 from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 from mediagoblin.tools.licenses import licenses_as_choices
-from mediagoblin.auth.forms import normalize_user_or_email_field
+from mediagoblin.auth.tools import normalize_user_or_email_field
 
 
 class EditForm(wtforms.Form):
diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index e4bb60e5..d2e01e44 100644
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@@ -1,3 +1,4 @@
+
 # GNU MediaGoblin -- federated, autonomous media hosting
 # Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
@@ -90,7 +91,7 @@ def test_register_views(test_app):
 
     ## Did we redirect to the proper page?  Use the right template?
     assert urlparse.urlsplit(response.location)[2] == '/u/happygirl/'
-    assert 'mediagoblin/user_pages/user.html' in template.TEMPLATE_TEST_CONTEXT
+    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(
@@ -101,7 +102,7 @@ def test_register_views(test_app):
 
     ## Make sure user is logged in
     request = template.TEMPLATE_TEST_CONTEXT[
-        'mediagoblin/user_pages/user.html']['request']
+        'mediagoblin/user_pages/user_nonactive.html']['request']
     assert request.session['user_id'] == unicode(new_user.id)
 
     ## Make sure we get email confirmation, and try verifying
diff --git a/mediagoblin/tests/test_ldap.py b/mediagoblin/tests/test_ldap.py
index 708ce6cb..48efb4b6 100644
--- a/mediagoblin/tests/test_ldap.py
+++ b/mediagoblin/tests/test_ldap.py
@@ -83,7 +83,7 @@ def test_ldap_plugin(ldap_plugin_app):
         res.follow()
 
         assert urlparse.urlsplit(res.location)[2] == '/u/chris/'
-        assert 'mediagoblin/user_pages/user.html' in template.TEMPLATE_TEST_CONTEXT
+        assert 'mediagoblin/user_pages/user_nonactive.html' in template.TEMPLATE_TEST_CONTEXT
 
         # Try to register with same email and username
         template.clear_test_template_context()
diff --git a/mediagoblin/tests/test_openid.py b/mediagoblin/tests/test_openid.py
index 3dfafb60..0ddfeff9 100644
--- a/mediagoblin/tests/test_openid.py
+++ b/mediagoblin/tests/test_openid.py
@@ -178,7 +178,7 @@ class TestOpenIDPlugin(object):
 
             # Correct place?
             assert urlparse.urlsplit(res.location)[2] == '/u/chris/'
-            assert 'mediagoblin/user_pages/user.html' in template.TEMPLATE_TEST_CONTEXT
+            assert 'mediagoblin/user_pages/user_nonactive.html' in template.TEMPLATE_TEST_CONTEXT
 
             # No need to test if user is in logged in and verification email
             # awaits, since openid uses the register_user function which is
diff --git a/mediagoblin/tests/test_persona.py b/mediagoblin/tests/test_persona.py
index 919877c9..7707618b 100644
--- a/mediagoblin/tests/test_persona.py
+++ b/mediagoblin/tests/test_persona.py
@@ -90,7 +90,7 @@ class TestPersonaPlugin(object):
             res.follow()
 
             assert urlparse.urlsplit(res.location)[2] == '/u/chris/'
-            assert 'mediagoblin/user_pages/user.html' in template.TEMPLATE_TEST_CONTEXT
+            assert 'mediagoblin/user_pages/user_nonactive.html' in template.TEMPLATE_TEST_CONTEXT
 
             # Try to register same Persona email address
             template.clear_test_template_context()