diff options
Diffstat (limited to 'hyperkitty')
-rw-r--r-- | hyperkitty/api.py | 2 | ||||
-rw-r--r-- | hyperkitty/tests/test_views.py | 4 | ||||
-rw-r--r-- | hyperkitty/tests_conf/__init__.py | 0 | ||||
-rw-r--r-- | hyperkitty/tests_conf/settings_tests.py | 48 | ||||
-rw-r--r-- | hyperkitty/tests_conf/urls_test.py | 11 |
5 files changed, 62 insertions, 3 deletions
diff --git a/hyperkitty/api.py b/hyperkitty/api.py index 1fc8212..a75dc4a 100644 --- a/hyperkitty/api.py +++ b/hyperkitty/api.py @@ -20,7 +20,7 @@ import json import re -from djangorestframework.views import View +from rest_framework.views import View from django.conf.urls.defaults import url from django.conf import settings from django.http import HttpResponseNotModified, HttpResponse diff --git a/hyperkitty/tests/test_views.py b/hyperkitty/tests/test_views.py index 8f540c6..dd85258 100644 --- a/hyperkitty/tests/test_views.py +++ b/hyperkitty/tests/test_views.py @@ -74,11 +74,11 @@ class MessageViewsTestCase(TestCase): User.objects.create_user('testuser', 'syst3m.w0rm+test@gmail.com', 'testPass') user = self.client.login(username='testuser', password='testPass') - resp = self.client.post(reverse('message_vote', kwargs={'mlist_fqdn': 'list@list.com'}), {'vote': 1, 'messageid': 123, }) + resp = self.client.post(reverse('message_vote', kwargs={'mlist_fqdn': 'list@list.com'}), {'vote': 1, 'hashid': 123, }) self.assertEqual(resp.status_code, 200) def test_unauth_vote(self): - resp = self.client.post(reverse('message_vote', kwargs={'mlist_fqdn': 'list@list.com'}), {'vote': 1, 'messageid': 123, }) + resp = self.client.post(reverse('message_vote', kwargs={'mlist_fqdn': 'list@list.com'}), {'vote': 1, 'hashid': 123, }) url = "%s?next=%s" % (reverse('user_login'), urllib.quote(reverse('message_vote', kwargs={'mlist_fqdn': 'list@list.com'}))) self.assertRedirects(resp, url) diff --git a/hyperkitty/tests_conf/__init__.py b/hyperkitty/tests_conf/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/hyperkitty/tests_conf/__init__.py diff --git a/hyperkitty/tests_conf/settings_tests.py b/hyperkitty/tests_conf/settings_tests.py new file mode 100644 index 0000000..8b6195e --- /dev/null +++ b/hyperkitty/tests_conf/settings_tests.py @@ -0,0 +1,48 @@ +# +# WARNING: this module is only used to run the unit tests. Do not use it to run +# HyperKitty, use the hyperkitty_standalone module instead (please see the +# HyperKitty docs to find it). +# + +import os +BASE_DIR = os.path.dirname(os.path.abspath(__file__)) +DEBUG = True +TEMPLATE_DEBUG = DEBUG + +MAILMAN_API_URL=r'http://%(username)s:%(password)s@localhost:8001/3.0/' +MAILMAN_USER='mailmanapi' +MAILMAN_PASS='mailmanpass' + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': ':memory:', + 'USER': '', # Not used with sqlite3. + 'PASSWORD': '', # Not used with sqlite3. + 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. + 'PORT': '', # Set to empty string for default. Not used with sqlite3. + } +} + +MIDDLEWARE_CLASSES = ( + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', +# 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', +# 'django.contrib.messages.middleware.MessageMiddleware', + 'hyperkitty.lib.store.KittyStoreDjangoMiddleware', +) + +ROOT_URLCONF = 'hyperkitty.tests_conf.urls_test' + +INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'hyperkitty', +) + +LOGIN_URL = '/hyperkitty/accounts/login/' +KITTYSTORE_URL = 'sqlite:' +KITTYSTORE_DEBUG=False +USE_MOCKUPS = False diff --git a/hyperkitty/tests_conf/urls_test.py b/hyperkitty/tests_conf/urls_test.py new file mode 100644 index 0000000..c4cd3a0 --- /dev/null +++ b/hyperkitty/tests_conf/urls_test.py @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- + +import hyperkitty + +from django.conf.urls.defaults import * + +urlpatterns = patterns('', + #url(r'^$', 'hyperkitty.views.pages.index'), + (r'^hyperkitty/', include('hyperkitty.urls')), + #url(r'', include('social_auth.urls')), +) |