diff options
author | adityacp | 2020-03-05 10:46:31 +0530 |
---|---|---|
committer | adityacp | 2020-03-05 10:46:31 +0530 |
commit | 5f0a5f7429ff74cccdc772fd45e0e5d3ee49891d (patch) | |
tree | 80cdebf0769550aeafb21fbee19f87ce50abcca7 /yaksh | |
parent | 674c81d9e1d3499e255e8995701fb65d1358a0ac (diff) | |
download | online_test-5f0a5f7429ff74cccdc772fd45e0e5d3ee49891d.tar.gz online_test-5f0a5f7429ff74cccdc772fd45e0e5d3ee49891d.tar.bz2 online_test-5f0a5f7429ff74cccdc772fd45e0e5d3ee49891d.zip |
Change in decorators, tests, travis
- Remove python 2.7 from travis
- Fix url reverse function import in views tests
- Fix error in is_email_verified decorator for user is_authenticated
Diffstat (limited to 'yaksh')
-rw-r--r-- | yaksh/decorators.py | 2 | ||||
-rw-r--r-- | yaksh/test_views.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/yaksh/decorators.py b/yaksh/decorators.py index 81912f0..d584868 100644 --- a/yaksh/decorators.py +++ b/yaksh/decorators.py @@ -40,7 +40,7 @@ def email_verified(func): user = request.user context = {} if not settings.IS_DEVELOPMENT: - if user.is_authenticated() and user_has_profile(user): + if user.is_authenticated and user_has_profile(user): if not user.profile.is_email_verified: context['success'] = False context['msg'] = "Your account is not verified. \ diff --git a/yaksh/test_views.py b/yaksh/test_views.py index 58c6633..7c932b5 100644 --- a/yaksh/test_views.py +++ b/yaksh/test_views.py @@ -11,7 +11,7 @@ import shutil from markdown import Markdown from django.contrib.auth.models import Group from django.contrib.auth import authenticate -from django.core.urlresolvers import reverse +from django.urls import reverse from django.test import TestCase from django.test import Client from django.http import Http404 @@ -3740,7 +3740,7 @@ class TestPasswordReset(TestCase): # Then self.assertEqual(response.context['email'], self.user1.email) self.assertEqual(response.status_code, 302) - self.assertRedirects(response, '/exam/reset/password_reset/mail_sent/') + self.assertRedirects(response, '/exam/reset/password_reset/done/') def test_password_change_post(self): """ |