Removing the assertion that this site is run by StatusNet (major oops) and adding...

[mediagoblin.git] / mediagoblin / tests / test_auth.py

diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index 11ed83bded6b109f7d1edf0b3d55fbf9140ec2c3..1bbc3d01550f597779bbd492f60c8dbb472897ed 100644 (file)
--- 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,18 +91,22 @@ def test_register_views(test_app):
 
     ## Did we redirect to the proper page?  Use the right template?
     assert urlparse.urlsplit(response.location)[2] == '/u/angrygirl/'
-    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(
         username=u'angrygirl').first()
     assert new_user
-    assert new_user.status == u'needs_email_verification'
-    assert new_user.email_verified == False
 
+    ## Make sure that the proper privileges are granted on registration
+
+    assert new_user.has_privilege(u'commenter')
+    assert new_user.has_privilege(u'uploader')
+    assert new_user.has_privilege(u'reporter')
+    assert not new_user.has_privilege(u'active')
     ## 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
@@ -131,8 +136,6 @@ def test_register_views(test_app):
     new_user = mg_globals.database.User.query.filter_by(
         username=u'angrygirl').first()
     assert new_user
-    assert new_user.status == u'needs_email_verification'
-    assert new_user.email_verified == False
 
     ## Verify the email activation works
     template.clear_test_template_context()
@@ -145,8 +148,6 @@ def test_register_views(test_app):
     new_user = mg_globals.database.User.query.filter_by(
         username=u'angrygirl').first()
     assert new_user
-    assert new_user.status == u'active'
-    assert new_user.email_verified == True
 
     # Uniqueness checks
     # -----------------
@@ -183,7 +184,7 @@ def test_register_views(test_app):
     message = mail.EMAIL_TEST_INBOX.pop()
     assert message['To'] == 'angrygrrl@example.org'
     email_context = template.TEMPLATE_TEST_CONTEXT[
-        'mediagoblin/auth/fp_verification_email.txt']
+        'mediagoblin/plugins/basic_auth/fp_verification_email.txt']
     #TODO - change the name of verification_url to something forgot-password-ish
     assert email_context['verification_url'] in message.get_payload(decode=True)
 
@@ -204,7 +205,8 @@ def test_register_views(test_app):
     ## Verify step 1 of password-change works -- can see form to change password
     template.clear_test_template_context()
     response = test_app.get("%s?%s" % (path, get_params))
-    assert 'mediagoblin/auth/change_fp.html' in template.TEMPLATE_TEST_CONTEXT
+    assert 'mediagoblin/plugins/basic_auth/change_fp.html' in \
+            template.TEMPLATE_TEST_CONTEXT
 
     ## Verify step 2.1 of password-change works -- report success to user
     template.clear_test_template_context()
@@ -330,7 +332,6 @@ def test_authentication_views(test_app):
             'next' : '/u/chris/'})
     assert urlparse.urlsplit(response.location)[2] == '/u/chris/'
 
-
 @pytest.fixture()
 def authentication_disabled_app(request):
     return get_app(