Merge remote-tracking branch 'refs/remotes/elrond/misc/pytest_enable_testing'

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

diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index a59a319c8c29c3f4cf254b7b6e76c1d3476efbb9..755727f9d35305687a11d0c33511f20bfc93a25e 100644 (file)
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@@ -17,12 +17,10 @@
 import urlparse
 import datetime
 
-from nose.tools import assert_equal
-
 from mediagoblin import mg_globals
 from mediagoblin.auth import lib as auth_lib
 from mediagoblin.db.models import User
-from mediagoblin.tests.tools import setup_fresh_app, get_app, fixture_add_user
+from mediagoblin.tests.tools import fixture_add_user
 from mediagoblin.tools import template, mail
 
 
@@ -65,7 +63,6 @@ def test_bcrypt_gen_password_hash():
         'notthepassword', hashed_pw, '3><7R45417')
 
 
-@setup_fresh_app
 def test_register_views(test_app):
     """
     Massive test function that all our registration-related views all work.
@@ -102,8 +99,8 @@ def test_register_views(test_app):
     context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/auth/register.html']
     form = context['register_form']
 
-    assert_equal (form.username.errors, [u'Field must be between 3 and 30 characters long.'])
-    assert_equal (form.password.errors, [u'Field must be between 5 and 1024 characters long.'])
+    assert form.username.errors == [u'Field must be between 3 and 30 characters long.']
+    assert form.password.errors == [u'Field must be between 5 and 1024 characters long.']
 
     ## bad form
     template.clear_test_template_context()
@@ -114,11 +111,11 @@ def test_register_views(test_app):
     context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/auth/register.html']
     form = context['register_form']
 
-    assert_equal (form.username.errors, [u'This field does not take email addresses.'])
-    assert_equal (form.email.errors, [u'This field requires an email address.'])
+    assert form.username.errors == [u'This field does not take email addresses.']
+    assert form.email.errors == [u'This field requires an email address.']
 
     ## At this point there should be no users in the database ;)
-    assert_equal(User.query.count(), 0)
+    assert User.query.count() == 0
 
     # Successful register
     # -------------------
@@ -131,9 +128,7 @@ def test_register_views(test_app):
     response.follow()
 
     ## Did we redirect to the proper page?  Use the right template?
-    assert_equal(
-        urlparse.urlsplit(response.location)[2],
-        '/u/happygirl/')
+    assert urlparse.urlsplit(response.location)[2] == '/u/happygirl/'
     assert 'mediagoblin/user_pages/user.html' in template.TEMPLATE_TEST_CONTEXT
 
     ## Make sure user is in place
@@ -224,9 +219,7 @@ def test_register_views(test_app):
     response.follow()
 
     ## Did we redirect to the proper page?  Use the right template?
-    assert_equal(
-        urlparse.urlsplit(response.location)[2],
-        '/auth/login/')
+    assert urlparse.urlsplit(response.location)[2] == '/auth/login/'
     assert 'mediagoblin/auth/login.html' in template.TEMPLATE_TEST_CONTEXT
 
     ## Make sure link to change password is sent by email
@@ -257,7 +250,7 @@ def test_register_views(test_app):
     response = test_app.get(
         "/auth/forgot_password/verify/?userid=%s&token=total_bs" % unicode(
             new_user.id), status=404)
-    assert_equal(response.status.split()[0], u'404') # status="404 NOT FOUND"
+    assert response.status.split()[0] == u'404' # status="404 NOT FOUND"
 
     ## Try using an expired token to change password, shouldn't work
     template.clear_test_template_context()
@@ -266,7 +259,7 @@ def test_register_views(test_app):
     new_user.fp_token_expire = datetime.datetime.now()
     new_user.save()
     response = test_app.get("%s?%s" % (path, get_params), status=404)
-    assert_equal(response.status.split()[0], u'404') # status="404 NOT FOUND"
+    assert response.status.split()[0] == u'404' # status="404 NOT FOUND"
     new_user.fp_token_expire = real_token_expiration
     new_user.save()
 
@@ -294,17 +287,14 @@ def test_register_views(test_app):
 
     # User should be redirected
     response.follow()
-    assert_equal(
-        urlparse.urlsplit(response.location)[2],
-        '/')
+    assert urlparse.urlsplit(response.location)[2] == '/'
     assert 'mediagoblin/root.html' in template.TEMPLATE_TEST_CONTEXT
 
 
-def test_authentication_views():
+def test_authentication_views(test_app):
     """
     Test logging in and logging out
     """
-    test_app = get_app(dump_old_app=False)
     # Make a new user
     test_user = fixture_add_user(active_user=False)
 
@@ -372,9 +362,7 @@ def test_authentication_views():
 
     # User should be redirected
     response.follow()
-    assert_equal(
-        urlparse.urlsplit(response.location)[2],
-        '/')
+    assert urlparse.urlsplit(response.location)[2] == '/'
     assert 'mediagoblin/root.html' in template.TEMPLATE_TEST_CONTEXT
 
     # Make sure user is in the session
@@ -389,9 +377,7 @@ def test_authentication_views():
 
     # Should be redirected to index page
     response.follow()
-    assert_equal(
-        urlparse.urlsplit(response.location)[2],
-        '/')
+    assert urlparse.urlsplit(response.location)[2] == '/'
     assert 'mediagoblin/root.html' in template.TEMPLATE_TEST_CONTEXT
 
     # Make sure the user is not in the session
@@ -407,6 +393,4 @@ def test_authentication_views():
             'username': u'chris',
             'password': 'toast',
             'next' : '/u/chris/'})
-    assert_equal(
-        urlparse.urlsplit(response.location)[2],
-        '/u/chris/')
+    assert urlparse.urlsplit(response.location)[2] == '/u/chris/'