aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/test_auth.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-09-29 10:41:43 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-09-29 10:41:43 -0500
commit515e3bd9af4f32b49d234ed001fc1e7e249e9030 (patch)
tree7e109f8430205b79fb3827b16bf5736146a0356f /mediagoblin/tests/test_auth.py
parent16ef14ba41f581ed950ae319f363e90540b2cbd7 (diff)
downloadmediagoblin-515e3bd9af4f32b49d234ed001fc1e7e249e9030.tar.lz
mediagoblin-515e3bd9af4f32b49d234ed001fc1e7e249e9030.tar.xz
mediagoblin-515e3bd9af4f32b49d234ed001fc1e7e249e9030.zip
Fixing ALL THE BROKEN TESTS. I probably broke most of them.
- We've now broken out user.html and user_nonactive.html but the tests didn't reflect it - the location of one of the module imports broke, but I didn't notice because of .pyc files ;) This commit sponsored by Tiberiu C. Turbureanu (ceata.org). Thank you!
Diffstat (limited to 'mediagoblin/tests/test_auth.py')
-rw-r--r--mediagoblin/tests/test_auth.py5
1 files changed, 3 insertions, 2 deletions
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