Moved HistoryRequestMiddleware to specific test

Author: macro1

runtests.py

@@ -37,7 +37,6 @@
         'django.contrib.sessions.middleware.SessionMiddleware',
         'django.contrib.auth.middleware.AuthenticationMiddleware',
         'django.contrib.messages.middleware.MessageMiddleware',
-        'simple_history.middleware.HistoryRequestMiddleware',
     ],
 )
 

simple_history/tests/tests/test_admin.py

@@ -1,5 +1,6 @@
 from datetime import datetime, timedelta
 from django_webtest import WebTest
+from django.test.utils import override_settings
 from django import VERSION
 from django.core.urlresolvers import reverse
 try:
@@ -8,6 +9,7 @@
 except ImportError:  # django 1.4 compatibility
     from django.contrib.auth.models import User
 from django.contrib.admin.util import quote
+from django.conf import settings
 
 from ..models import Book, Person, Poll
 
@@ -114,7 +116,7 @@ def test_history_form(self):
         self.assertEqual(poll.question, "what?")
         self.assertEqual(poll.pub_date, tomorrow)
         self.assertEqual([p.history_user for p in Poll.history.all()],
-                         [self.user] * 3)
+                         [self.user, None, None])
 
     def test_history_user_on_save_in_admin(self):
         self.login()
@@ -156,3 +158,26 @@ def test_historical_user_with_setter(self):
         self.login()
         add_page = self.app.get(reverse('admin:tests_paper_add'))
         add_page.form.submit()
+
+    def test_history_user_not_saved(self):
+        self.login()
+        poll = Poll.objects.create(question="why?", pub_date=today)
+        historical_poll = poll.history.all()[0]
+        self.assertIsNone(
+            historical_poll.history_user,
+            "No way to know of request, history_user should be unset.",
+        )
+
+    def test_middleware_saves_user(self):
+        overridden_settings = {
+            'MIDDLEWARE_CLASSES':
+                settings.MIDDLEWARE_CLASSES
+                + ['simple_history.middleware.HistoryRequestMiddleware'],
+        }
+        with override_settings(**overridden_settings):
+            self.login()
+            poll = Poll.objects.create(question="why?", pub_date=today)
+            historical_poll = poll.history.all()[0]
+            self.assertEqual(historical_poll.history_user, self.user,
+                             "Middleware should make the request available to "
+                             "retrieve history_user.")