Merge branch 'master' into processing

1 files changed, 15 insertions, 6 deletions

diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index ad9dd35b..4781dd9b 100644
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@@ -153,9 +153,9 @@ def test_register_views(test_app):
     ## Did we redirect to the proper page?  Use the right template?
     assert_equal(
         urlparse.urlsplit(response.location)[2],
-        '/auth/register/success/')
+        '/u/happygirl/')
     assert util.TEMPLATE_TEST_CONTEXT.has_key(
-        'mediagoblin/auth/register_success.html')
+        'mediagoblin/user_pages/user.html')
 
     ## Make sure user is in place
     new_user = mg_globals.database.User.find_one(
@@ -164,6 +164,11 @@ def test_register_views(test_app):
     assert new_user['status'] == u'needs_email_verification'
     assert new_user['email_verified'] == False
 
+    ## Make sure user is logged in
+    request = util.TEMPLATE_TEST_CONTEXT[
+        'mediagoblin/user_pages/user.html']['request']
+    assert request.session['user_id'] == unicode(new_user['_id'])
+
     ## Make sure we get email confirmation, and try verifying
     assert len(util.EMAIL_TEST_INBOX) == 1
     message = util.EMAIL_TEST_INBOX.pop()
@@ -185,12 +190,14 @@ def test_register_views(test_app):
 
     ## Try verifying with bs verification key, shouldn't work
     util.clear_test_template_context()
-    test_app.get(
+    response = test_app.get(
         "/auth/verify_email/?userid=%s&token=total_bs" % unicode(
             new_user['_id']))
+    response.follow()
     context = util.TEMPLATE_TEST_CONTEXT[
         'mediagoblin/user_pages/user.html']
-    assert context['verification_successful'] == False
+    # 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': 'happygirl'})
     assert new_user
@@ -199,10 +206,12 @@ def test_register_views(test_app):
 
     ## Verify the email activation works
     util.clear_test_template_context()
-    test_app.get("%s?%s" % (path, get_params))
+    response = test_app.get("%s?%s" % (path, get_params))
+    response.follow()
     context = util.TEMPLATE_TEST_CONTEXT[
         'mediagoblin/user_pages/user.html']
-    assert context['verification_successful'] == True
+    # 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': 'happygirl'})
     assert new_user