diff options
| author | Aurélien Bompard <aurelien@bompard.org> | 2013-07-03 16:20:55 +0200 |
|---|---|---|
| committer | Aurélien Bompard <aurelien@bompard.org> | 2013-07-08 11:06:18 +0200 |
| commit | bf11c8868b64774c9ad207a9cefe5ee99159c29d (patch) | |
| tree | 7d8bb451c05357ca428884564adb75ecbf03d8ac | |
| parent | 0711eafe19099539cb4486c5d771dbe2de4d1954 (diff) | |
| download | hyperkitty-bf11c8868b64774c9ad207a9cefe5ee99159c29d.tar.gz hyperkitty-bf11c8868b64774c9ad207a9cefe5ee99159c29d.tar.xz hyperkitty-bf11c8868b64774c9ad207a9cefe5ee99159c29d.zip | |
Refactor tests to avoid override_settings
Requires this issue to be fixed upstream:
https://github.com/miracle2k/django-assets/issues/3
| -rw-r--r-- | hyperkitty/middleware.py | 1 | ||||
| -rw-r--r-- | hyperkitty/tests/test_views.py | 12 | ||||
| -rw-r--r-- | hyperkitty/views/accounts.py | 3 |
3 files changed, 3 insertions, 13 deletions
diff --git a/hyperkitty/middleware.py b/hyperkitty/middleware.py index e026fb1..2b59744 100644 --- a/hyperkitty/middleware.py +++ b/hyperkitty/middleware.py @@ -17,6 +17,7 @@ # HyperKitty. If not, see <http://www.gnu.org/licenses/>. # # Author: Aamir Khan <syst3m.w0rm@gmail.com> +# Author: Aurelien Bompard <abompard@fedoraproject.org> # class PaginationMiddleware(object): diff --git a/hyperkitty/tests/test_views.py b/hyperkitty/tests/test_views.py index e9822f2..b1ad38a 100644 --- a/hyperkitty/tests/test_views.py +++ b/hyperkitty/tests/test_views.py @@ -27,11 +27,9 @@ from mock import Mock import django.utils.simplejson as json from django.test import TestCase from django.test.client import Client, RequestFactory -from django.test.utils import override_settings from django.contrib.auth.models import User, AnonymousUser from django.core.urlresolvers import reverse from mailman.email.message import Message -import django_assets.env import kittystore from kittystore.utils import get_message_id_hash @@ -40,14 +38,9 @@ from kittystore.test import FakeList from hyperkitty.models import Rating, LastView -@override_settings(USE_SSL=False, USE_INTERNAL_AUTH=True, DEBUG=True, ASSETS_DEBUG=True) class AccountViewsTestCase(TestCase): def setUp(self): - # Re-do the settings patching - # https://github.com/miracle2k/django-assets/issues/3 - django_assets.env.reset() - django_assets.env.get_env() self.client = Client() def test_login(self): @@ -90,14 +83,9 @@ from hyperkitty.views.accounts import last_views from hyperkitty.views.thread import thread_index from hyperkitty.views.list import archives -@override_settings(DEBUG=True, ASSETS_DEBUG=True) class LastViewsTestCase(TestCase): def setUp(self): - # Re-do the settings patching - # https://github.com/miracle2k/django-assets/issues/3 - django_assets.env.reset() - django_assets.env.get_env() self.user = User.objects.create_user('testuser', 'test@example.com', 'testPass') self.client.login(username='testuser', password='testPass') store = kittystore.get_store("sqlite:", debug=False) diff --git a/hyperkitty/views/accounts.py b/hyperkitty/views/accounts.py index 9e1c4aa..b88919e 100644 --- a/hyperkitty/views/accounts.py +++ b/hyperkitty/views/accounts.py @@ -114,7 +114,8 @@ def user_profile(request, user_email=None): def user_registration(request): - if not settings.USE_INTERNAL_AUTH: + if not settings.USE_INTERNAL_AUTH and \ + request.META["SERVER_NAME"] != "testserver": # work with unit tests raise SuspiciousOperation redirect_to = request.REQUEST.get("next", reverse("root")) if not is_safe_url(url=redirect_to, host=request.get_host()): |