Merge ac055eb into 0703fd3

jazzband · Apr 14, 2014 · fbb8fe6 · fbb8fe6
2 parents 0703fd3 + ac055eb
commit fbb8fe6
Showing 1 changed file with 33 additions and 2 deletions.
diff --git a/simple_history/tests/tests.py b/simple_history/tests/tests.py
@@ -6,6 +6,7 @@
 from django_webtest import WebTest
 from django.core.files.base import ContentFile
 from django.core.urlresolvers import reverse
+from django.db.models.loading import get_model
 from simple_history.tests.models import AdminProfile, Bookcase, MultiOneToOne
 from simple_history.models import HistoricalRecords
 try:
@@ -15,8 +16,10 @@
     from django.contrib.auth.models import User
 
 from .models import (Poll, Choice, Restaurant, Person, FileModel, Document,
-                     Book, Library, State, SelfFK, Temperature, WaterLevel)
-from .models import ExternalModel1, ExternalModel3, UnicodeVerboseName
+                     Book, Library, State, SelfFK, Temperature, WaterLevel,
+                     HistoricalPoll)
+from .models import (ExternalModel1, ExternalModel1, 
+                     ExternalModel3, UnicodeVerboseName)
 from simple_history import register
 from simple_history.tests.external.models import ExternalModel2, ExternalModel4
 
@@ -329,6 +332,7 @@ def get_table_name(self, manager):
     def test_explicit_app_label(self):
         self.assertEqual(self.get_table_name(ExternalModel1.objects),
                          'external_externalmodel1')
+
         self.assertEqual(self.get_table_name(ExternalModel1.history),
                          'external_historicalexternalmodel1')
 
@@ -348,6 +352,27 @@ def test_register_app_label(self):
         self.assertEqual(self.get_table_name(ExternalModel4.histories),
                          'tests_historicalexternalmodel4')
 
+    def test_get_model(self):
+        self.assertEqual(get_model('external','ExternalModel1'), 
+                         ExternalModel1)
+        self.assertEqual(get_model('external','HistoricalExternalModel1'), 
+                         ExternalModel1.history.model)
+
+        self.assertEqual(get_model('external','ExternalModel2'), 
+                         ExternalModel2)
+        self.assertEqual(get_model('external','HistoricalExternalModel2'), 
+                         ExternalModel2.history.model)
+
+        self.assertEqual(get_model('tests','ExternalModel3'), 
+                         ExternalModel3)
+        self.assertEqual(get_model('external','HistoricalExternalModel3'), 
+                         ExternalModel3.histories.model)
+
+        self.assertEqual(get_model('external','ExternalModel4'), 
+                         ExternalModel4)
+        self.assertEqual(get_model('tests','HistoricalExternalModel4'), 
+                         ExternalModel4.histories.model)
+
 
 class HistoryManagerTest(TestCase):
     def test_most_recent(self):
@@ -361,6 +386,12 @@ def test_most_recent(self):
         self.assertEqual(most_recent.__class__, Poll)
         self.assertEqual(most_recent.question, "why?")
 
+    def test_get_model(self):
+        self.assertEqual(get_model('tests','poll'),
+                         Poll)
+        self.assertEqual(get_model('tests','historicalpoll'),
+                         HistoricalPoll)
+
     def test_most_recent_on_model_class(self):
         Poll.objects.create(question="what's up?", pub_date=today)
         self.assertRaises(TypeError, Poll.history.most_recent)