diff options
Diffstat (limited to 'mediagoblin/tests')
| -rw-r--r-- | mediagoblin/tests/test_auth.py | 14 | ||||
| -rw-r--r-- | mediagoblin/tests/test_privileges.py | 6 | ||||
| -rw-r--r-- | mediagoblin/tests/test_submission.py | 2 |
3 files changed, 10 insertions, 12 deletions
diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py index 6cf05444..edbd27ee 100644 --- a/mediagoblin/tests/test_auth.py +++ b/mediagoblin/tests/test_auth.py @@ -99,6 +99,12 @@ def test_register_views(test_app): assert new_user.status == u'needs_email_verification' assert new_user.email_verified == False + ## Make sure that the proper privileges are granted on registration + + assert new_user.has_privilege(u'commenter') + assert new_user.has_privilege(u'uploader') + assert new_user.has_privilege(u'reporter') + assert not new_user.has_privilege(u'active') ## Make sure user is logged in request = template.TEMPLATE_TEST_CONTEXT[ 'mediagoblin/user_pages/user.html']['request'] @@ -330,14 +336,6 @@ def test_authentication_views(test_app): 'next' : '/u/chris/'}) assert urlparse.urlsplit(response.location)[2] == '/u/chris/' -def test_basic_privileges_granted_on_registration(test_app): - user = User.query.filter(User.username==u'angrygirl').first() - - assert User.has_privilege(u'commenter') - assert User.has_privilege(u'uploader') - assert User.has_privilege(u'reporter') - assert not User.has_privilege(u'active') - @pytest.fixture() def authentication_disabled_app(request): return get_app( diff --git a/mediagoblin/tests/test_privileges.py b/mediagoblin/tests/test_privileges.py index ced87b7f..9ae523f8 100644 --- a/mediagoblin/tests/test_privileges.py +++ b/mediagoblin/tests/test_privileges.py @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import pytest -from datetime import datetime, timedelta +from datetime import date, timedelta from webtest import AppError from mediagoblin.tests.tools import fixture_add_user, fixture_media_entry @@ -88,7 +88,7 @@ class TestPrivilegeFunctionality: user_ban.delete() user_ban = UserBan(user_id=uid, reason=u'Testing whether user is banned', - expiration_date= datetime.now() + timedelta(days=20)) + expiration_date= date.today() + timedelta(days=20)) user_ban.save() response = self.test_app.get('/') @@ -100,7 +100,7 @@ class TestPrivilegeFunctionality: #---------------------------------------------------------------------- user_ban = UserBan.query.get(uid) user_ban.delete() - exp_date = datetime.now() - timedelta(days=20) + exp_date = date.today() - timedelta(days=20) user_ban = UserBan(user_id=uid, reason=u'Testing whether user is banned', expiration_date= exp_date) diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py index d10957d7..d8cb9827 100644 --- a/mediagoblin/tests/test_submission.py +++ b/mediagoblin/tests/test_submission.py @@ -46,7 +46,7 @@ class TestSubmission: # TODO: Possibly abstract into a decorator like: # @as_authenticated_user('chris') - fixture_add_user(privileges=[u'active',u'uploader']) + fixture_add_user(privileges=[u'active',u'uploader', u'commenter']) self.login() |