Fixed app merge and added extra tests.

misago/conf/defaults.py

@@ -42,7 +42,6 @@ INSTALLED_APPS = (
     'django.contrib.staticfiles',
     'misago.core',
     'misago.conf',
-    'misago.views',
 )
 
 MIDDLEWARE_CLASSES = (

misago/core/errorpages.py

@@ -1,4 +1,5 @@
 from django.shortcuts import render
+from misago.core.utils import is_request_to_misago
 
 
 def _error_page(request, code, message=None):
@@ -18,9 +19,6 @@ def page_not_found(request):
 
 
 # Decorators for custom error page handlers
-from misago.views.utils import is_request_to_misago
-
-
 def shared_403_exception_handler(f):
     def page_decorator(request, *args, **kwargs):
         if is_request_to_misago(request):

misago/core/exceptionhandler.py

@@ -1,7 +1,7 @@
 from django.core.exceptions import PermissionDenied
 from django.http import Http404
-from misago.views import errorpages
-from misago.views.exceptions import OutdatedSlug
+from misago.core import errorpages
+from misago.core.exceptions import OutdatedSlug
 
 
 HANDLED_EXCEPTIONS = (Http404, OutdatedSlug, PermissionDenied,)

misago/core/middleware/exceptionhandler.py

@@ -1,5 +1,5 @@
-from misago.views import exceptionhandler
-from misago.views.utils import is_request_to_misago
+from misago.core import exceptionhandler
+from misago.core.utils import is_request_to_misago
 
 
 class ExceptionHandlerMiddleware(object):

misago/core/tests/test_threadstore.py

@@ -0,0 +1,40 @@
+from django.core.urlresolvers import reverse
+from django.test import TestCase
+from django.test.client import RequestFactory
+from misago.core.middleware.threadstore import ThreadStoreMiddleware
+from misago.core import threadstore
+
+
+class ThreadStoreTests(TestCase):
+    def setUp(self):
+        threadstore.clear()
+
+    def test_set_get_value(self):
+        """It's possible to set and get value from threadstore"""
+        self.assertEqual(threadstore.get('knights_say'), None)
+
+        returned_value = threadstore.set('knights_say', 'Ni!')
+        self.assertEqual(returned_value, 'Ni!')
+        self.assertEqual(threadstore.get('knights_say'), 'Ni!')
+
+    def test_clear_store(self):
+        """clear cleared threadstore"""
+        self.assertEqual(threadstore.get('the_fish'), None)
+        threadstore.set('the_fish', 'Eric')
+        self.assertEqual(threadstore.get('the_fish'), 'Eric')
+        threadstore.clear()
+        self.assertEqual(threadstore.get('the_fish'), None)
+
+
+class ThreadStoreMiddlewareTests(TestCase):
+    def setUp(self):
+        self.request = RequestFactory().get(reverse('forum_index'))
+
+    def test_middleware_clears_store_on_response_exception(self):
+        "Middleware cleared store on response"
+
+        threadstore.set('any_chesse', 'Nope')
+        middleware = ThreadStoreMiddleware()
+        response = middleware.process_response(self.request, 'FakeResponse')
+        self.assertEqual(response, 'FakeResponse')
+        self.assertEqual(threadstore.get('any_chesse'), None)