Fix tests for Django 1.7

Unset middleware request

Author: macro1

simple_history/tests/models.py

@@ -321,25 +321,25 @@ class TrackedWithConcreteBase(TrackedConcreteBase):
     pass
 
 
-class TrackedWithTrackedAbstractAndUntrackedConcreteBase(TrackedAbstractBaseA, UntrackedConcreteBase):
+class InheritTracking1(TrackedAbstractBaseA, UntrackedConcreteBase):
     pass
 
 
-class BaseTrackedWithIndirectTrackedAbstractBase(TrackedAbstractBaseA):
+class BaseInheritTracking2(TrackedAbstractBaseA):
     pass
 
 
-class TrackedWithIndirectTrackedAbstractBase(BaseTrackedWithIndirectTrackedAbstractBase):
+class InheritTracking2(BaseInheritTracking2):
     pass
 
 
-class BaseTrackedWithIndirectTrackedConcreteBase(TrackedAbstractBaseA):
+class BaseInheritTracking3(TrackedAbstractBaseA):
     pass
 
 
-class TrackedWithIndirectTrackedConcreteBase(BaseTrackedWithIndirectTrackedConcreteBase):
+class InheritTracking3(BaseInheritTracking3):
     pass
 
 
-class TrackedWithAbstractBaseToRegister(TrackedAbstractBaseA):
+class InheritTracking4(TrackedAbstractBaseA):
     pass

simple_history/tests/tests/test_models.py

@@ -22,10 +22,7 @@
     City, Contact, ContactRegister,
     TrackedAbstractBaseA, TrackedAbstractBaseB,
     TrackedWithAbstractBase, TrackedWithConcreteBase,
-    TrackedWithTrackedAbstractAndUntrackedConcreteBase,
-    TrackedWithIndirectTrackedAbstractBase,
-    TrackedWithIndirectTrackedConcreteBase,
-    TrackedWithAbstractBaseToRegister,
+    InheritTracking1, InheritTracking2, InheritTracking3, InheritTracking4,
 )
 from ..external.models import ExternalModel2, ExternalModel4
 
@@ -808,26 +805,26 @@ class TrackedWithMultipleAbstractBases(TrackedAbstractBaseA, TrackedAbstractBase
 
     def test_tracked_abstract_and_untracked_concrete_base(self):
         self.assertEqual(
-            [f.attname for f in TrackedWithTrackedAbstractAndUntrackedConcreteBase.history.model._meta.fields],
+            [f.attname for f in InheritTracking1.history.model._meta.fields],
             ['id', 'untrackedconcretebase_ptr_id', 'history_id', 'history_date', 'history_user_id', 'history_type'],
         )
 
     def test_indirect_tracked_abstract_base(self):
         self.assertEqual(
-            [f.attname for f in TrackedWithIndirectTrackedAbstractBase.history.model._meta.fields],
+            [f.attname for f in InheritTracking2.history.model._meta.fields],
             [
-                'id', 'basetrackedwithindirecttrackedabstractbase_ptr_id',
+                'id', 'baseinherittracking2_ptr_id',
                 'history_id', 'history_date', 'history_user_id', 'history_type'],
         )
 
     def test_indirect_tracked_concrete_base(self):
         self.assertEqual(
-            [f.attname for f in TrackedWithIndirectTrackedConcreteBase.history.model._meta.fields],
+            [f.attname for f in InheritTracking3.history.model._meta.fields],
             [
-                'id', 'basetrackedwithindirecttrackedconcretebase_ptr_id',
+                'id', 'baseinherittracking3_ptr_id',
                 'history_id', 'history_date', 'history_user_id', 'history_type'],
         )
 
     def test_registering_with_tracked_abstract_base(self):
         with self.assertRaises(exceptions.MultipleRegistrationsError):
-            register(TrackedWithAbstractBaseToRegister)
+            register(InheritTracking4)