X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Ftests%2Ftest_auth.py;h=bd79a40750ad6c859dfde9672c79f3e902f00147;hb=7a3d00ec217cc3fd44788b9d8c63ab9f7b1d05a7;hp=153c6e53824e88fca163c6090349544238222b11;hpb=817066506d846d06d0489dfb42b8200b86f61153;p=mediagoblin.git

diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index 153c6e53..bd79a407 100644
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@@ -20,7 +20,7 @@ import datetime
 from nose.tools import assert_equal
 
 from mediagoblin.auth import lib as auth_lib
-from mediagoblin.tests.tools import setup_fresh_app
+from mediagoblin.tests.tools import setup_fresh_app, fixture_add_user
 from mediagoblin import mg_globals
 from mediagoblin.tools import template, mail
 
@@ -162,8 +162,8 @@ def test_register_views(test_app):
     new_user = mg_globals.database.User.find_one(
         {'username': 'happygirl'})
     assert new_user
-    assert new_user['status'] == u'needs_email_verification'
-    assert new_user['email_verified'] == False
+    assert new_user.status == u'needs_email_verification'
+    assert new_user.email_verified == False
 
     ## Make sure user is logged in
     request = template.TEMPLATE_TEST_CONTEXT[
@@ -202,8 +202,8 @@ def test_register_views(test_app):
     new_user = mg_globals.database.User.find_one(
         {'username': 'happygirl'})
     assert new_user
-    assert new_user['status'] == u'needs_email_verification'
-    assert new_user['email_verified'] == False
+    assert new_user.status == u'needs_email_verification'
+    assert new_user.email_verified == False
 
     ## Verify the email activation works
     template.clear_test_template_context()
@@ -216,8 +216,8 @@ def test_register_views(test_app):
     new_user = mg_globals.database.User.find_one(
         {'username': 'happygirl'})
     assert new_user
-    assert new_user['status'] == u'active'
-    assert new_user['email_verified'] == True
+    assert new_user.status == u'active'
+    assert new_user.email_verified == True
 
     # Uniqueness checks
     # -----------------
@@ -280,16 +280,16 @@ def test_register_views(test_app):
     template.clear_test_template_context()
     response = test_app.get(
         "/auth/forgot_password/verify/?userid=%s&token=total_bs" % unicode(
-            new_user._id), status=400)
-    assert response.status == '400 Bad Request'
+            new_user._id), status=404)
+    assert_equal(response.status, '404 Not Found')
 
     ## Try using an expired token to change password, shouldn't work
     template.clear_test_template_context()
     real_token_expiration = new_user['fp_token_expire']
     new_user['fp_token_expire'] = datetime.datetime.now()
     new_user.save()
-    response = test_app.get("%s?%s" % (path, get_params), status=400)
-    assert response.status == '400 Bad Request'
+    response = test_app.get("%s?%s" % (path, get_params), status=404)
+    assert_equal(response.status, '404 Not Found')
     new_user['fp_token_expire'] = real_token_expiration
     new_user.save()
 
@@ -332,11 +332,7 @@ def test_authentication_views(test_app):
     Test logging in and logging out
     """
     # Make a new user
-    test_user = mg_globals.database.User()
-    test_user['username'] = u'chris'
-    test_user['email'] = u'chris@example.com'
-    test_user['pw_hash'] = auth_lib.bcrypt_gen_password_hash('toast')
-    test_user.save()
+    test_user = fixture_add_user(active_user=False)
 
     # Get login
     # ---------