moved tests package inside app folder

evonove · Jun 13, 2015 · 219e6b1 · 219e6b1
1 parent 74b12e1
commit 219e6b1
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 2 deletions.
diff --git a/stored_messages/__init__.py b/stored_messages/__init__.py
@@ -2,4 +2,4 @@
 
 from django.contrib.messages.api import *
 from stored_messages.api import *
-from stored_messages.constants import *
+from stored_messages.constants import *
diff --git a/tests/__init__.py → stored_messages/tests/__init__.py b/tests/__init__.py → stored_messages/tests/__init__.py
@@ -3,7 +3,7 @@
 from django.test import TestCase, RequestFactory
 from django.utils.six.moves import reload_module
 
-from stored_messages.compat import get_user_model
+
 from stored_messages import settings
 from stored_messages import storage
 
@@ -14,6 +14,8 @@ class BaseTest(TestCase):
     urls = 'tests.urls'
 
     def setUp(self):
+        from stored_messages.compat import get_user_model
+
         self.factory = RequestFactory()
 
         self.user = get_user_model().objects.create_user("test_user", "t@user.com", "123456")

diff --git a/stored_messages/tests/settings.py b/stored_messages/tests/settings.py
@@ -0,0 +1,55 @@
+
+INSTALLED_APPS = [
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sites",
+    "django.contrib.messages",
+    "django.contrib.sessions",
+    "stored_messages",
+]
+
+try:
+    import rest_framework
+    INSTALLED_APPS.append("rest_framework")
+except ImportError:
+    pass
+
+
+DEBUG = True
+USE_TZ = True
+
+DATABASES = {
+    "default": {
+        "ENGINE": "django.db.backends.sqlite3",
+    }
+}
+
+ROOT_URLCONF = "stored_messages.urls"
+
+# Django 1.7 has a new, minimal default set for MIDDLEWARE_CLASSES so be explicit
+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',
+)
+
+SITE_ID = 1
+
+MESSAGE_STORAGE = 'stored_messages.storage.PersistentStorage',
+STORED_MESSAGES = {
+    'REDIS_URL': 'redis://localhost:6379/0',
+}
+
+MOCK_REDIS_SERVER = True
+
+import django
+
+if django.VERSION[:2] < (1, 6):
+    TEST_RUNNER = 'discover_runner.DiscoverRunner'
+    INSTALLED_APPS += ('discover_runner',)
+else:
+    TEST_RUNNER = 'django.test.runner.DiscoverRunner'
+
+SECRET_KEY = 'FUUUFU'
diff --git a/tests/test_api.py → stored_messages/tests/test_api.py b/tests/test_api.py → stored_messages/tests/test_api.py
diff --git a/tests/test_default_backend.py → ...ed_messages/tests/test_default_backend.py b/tests/test_default_backend.py → ...ed_messages/tests/test_default_backend.py
diff --git a/tests/test_models.py → stored_messages/tests/test_models.py b/tests/test_models.py → stored_messages/tests/test_models.py
diff --git a/tests/test_redis_backend.py → stored_messages/tests/test_redis_backend.py b/tests/test_redis_backend.py → stored_messages/tests/test_redis_backend.py
diff --git a/tests/test_restapi.py → stored_messages/tests/test_restapi.py b/tests/test_restapi.py → stored_messages/tests/test_restapi.py
diff --git a/tests/test_storage.py → stored_messages/tests/test_storage.py b/tests/test_storage.py → stored_messages/tests/test_storage.py
diff --git a/tests/test_templatetags.py → stored_messages/tests/test_templatetags.py b/tests/test_templatetags.py → stored_messages/tests/test_templatetags.py
diff --git a/tests/urls.py → stored_messages/tests/urls.py b/tests/urls.py → stored_messages/tests/urls.py
diff --git a/tests/views.py → stored_messages/tests/views.py b/tests/views.py → stored_messages/tests/views.py