aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/test_submission.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-12-04 11:06:08 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-12-04 11:06:08 -0600
commitf79886023fb3d8fb55214e19131740159992aa34 (patch)
tree1ac322a90da1a9cc25cebf653f6b70bb918808ad /mediagoblin/tests/test_submission.py
parentf80f5b58a818dfcbbf984fc3e580df5fbf04917b (diff)
parentea5a5b15a3d552eaefc4cf220ed155af06f7c8f7 (diff)
downloadmediagoblin-f79886023fb3d8fb55214e19131740159992aa34.tar.lz
mediagoblin-f79886023fb3d8fb55214e19131740159992aa34.tar.xz
mediagoblin-f79886023fb3d8fb55214e19131740159992aa34.zip
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/tests/test_submission.py')
-rw-r--r--mediagoblin/tests/test_submission.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py
index eea5747f..7ea6c4bc 100644
--- a/mediagoblin/tests/test_submission.py
+++ b/mediagoblin/tests/test_submission.py
@@ -19,8 +19,8 @@ import pkg_resources
from nose.tools import assert_equal, assert_true, assert_false
-from mediagoblin.auth import lib as auth_lib
-from mediagoblin.tests.tools import setup_fresh_app, get_test_app
+from mediagoblin.tests.tools import setup_fresh_app, get_test_app, \
+ fixture_add_user
from mediagoblin import mg_globals
from mediagoblin.tools import template, common
@@ -45,13 +45,7 @@ class TestSubmission:
# TODO: Possibly abstract into a decorator like:
# @as_authenticated_user('chris')
- test_user = mg_globals.database.User()
- test_user['username'] = u'chris'
- test_user['email'] = u'chris@example.com'
- test_user['email_verified'] = True
- test_user['status'] = u'active'
- test_user['pw_hash'] = auth_lib.bcrypt_gen_password_hash('toast')
- test_user.save()
+ test_user = fixture_add_user()
self.test_user = test_user