projects
/
mediagoblin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dot-Notation for Users.status
[mediagoblin.git]
/
mediagoblin
/
tests
/
test_auth.py
diff --git
a/mediagoblin/tests/test_auth.py
b/mediagoblin/tests/test_auth.py
index ee08576189de0d83ab136669021b37d5abb558a3..bd79a40750ad6c859dfde9672c79f3e902f00147 100644
(file)
--- 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 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
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
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[
## 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
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()
## 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
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
# -----------------
# Uniqueness checks
# -----------------
@@
-332,11
+332,7
@@
def test_authentication_views(test_app):
Test logging in and logging out
"""
# Make a new user
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
# ---------
# Get login
# ---------