Initial development

tests/test_import.py

@@ -72,37 +72,6 @@ def test_debug_message(self):
         debug_message = importer.debug_message(text)
         self.assertEqual(debug_message, None)
 
-    def test_get_validated_models_with_invalid_model(self):
-        models = ["fake.ModelName"]
-        importer = Importer(models=models)
-        with self.assertRaises(CommandError) as context:
-            importer.get_validated_models()
-        self.assertEqual("'fake.modelname' is not recognised as a model name.", str(context.exception))
-
-    def test_get_validated_models_with_single_valid_model(self):
-        models = ["tests.Advert"]
-        importer = Importer(models=models)
-        models = importer.get_validated_models()
-        # `SimilarToAdvert` is added because it's an EXTRA_SUPPORTED_MODEL for `Advert`
-        self.assertListEqual(models, [Advert])
-
-    def test_get_validated_models_with_multiple_valid_models(self):
-        models = ["tests.Advert", "tests.SimplePage", "tests.SimilarToAdvert"]
-        importer = Importer(models=models)
-        models = importer.get_validated_models()
-        # `SimilarToAdvert` is added because it's an EXTRA_SUPPORTED_MODEL for `Advert`
-        self.assertListEqual(models, [Advert, SimplePage, SimilarToAdvert])
-
-    def test_get_model_for_path(self):
-        importer = Importer(models=[])
-        advert_model = importer.get_model_for_path("tests.Advert")
-        self.assertEqual(advert_model, Advert)
-        simple_page = importer.get_model_for_path("tests.SimplePage")
-        self.assertEqual(simple_page, SimplePage)
-        with self.assertRaises(ObjectDoesNotExist) as context:
-            bad_model_path = importer.get_model_for_path("tests.BadModelPathName")
-        self.assertEqual("ContentType matching query does not exist.", str(context.exception))
-
     def test_get_model_serializer(self):
         importer = Importer(models=["tests.Advert"])
         advert_serializer = importer.get_model_serializer("tests.serializers.AdvertSerializer")

tests/test_utils.py

@@ -0,0 +1,41 @@
+from django.core.exceptions import ObjectDoesNotExist
+from django.core.management.base import CommandError
+from django.test import TestCase
+
+from wagtail_airtable.utils import get_model_for_path, get_all_models, get_validated_models
+
+from tests.models import Advert, ModelNotUsed, SimilarToAdvert, SimplePage
+from tests.serializers import AdvertSerializer
+
+
+
+class TestUtilFunctions(TestCase):
+
+    def test_get_model_for_path(self):
+        advert_model = get_model_for_path("tests.Advert")
+        self.assertEqual(advert_model, Advert)
+        simple_page = get_model_for_path("tests.SimplePage")
+        self.assertEqual(simple_page, SimplePage)
+        with self.assertRaises(ObjectDoesNotExist) as context:
+            bad_model_path = get_model_for_path("tests.BadModelPathName")
+        self.assertEqual("ContentType matching query does not exist.", str(context.exception))
+
+    def test_get_validated_models_with_single_valid_model(self):
+        models = ["tests.Advert"]
+        models = get_validated_models(models=models)
+        self.assertListEqual(models, [Advert])
+
+    def test_get_validated_models_with_multiple_valid_models(self):
+        models = ["tests.Advert", "tests.SimplePage", "tests.SimilarToAdvert"]
+        models = get_validated_models(models=models)
+        self.assertListEqual(models, [Advert, SimplePage, SimilarToAdvert])
+
+    def test_get_validated_models_with_invalid_model(self):
+        models = ["fake.ModelName"]
+        with self.assertRaises(CommandError) as context:
+            get_validated_models(models=models)
+        self.assertEqual("'fake.ModelName' is not recognised as a model name.", str(context.exception))
+
+    def test_get_all_models(self):
+        available_models = get_all_models()
+        self.assertListEqual(available_models, [SimplePage, Advert, SimilarToAdvert])

wagtail_airtable/utils.py

@@ -4,8 +4,9 @@
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist
+from django.core.management.base import CommandError
+
 
-# TODO write tests for these
 def get_model_for_path(model_path):
     """
     Given an 'app_name.model_name' string, return the model class
@@ -15,21 +16,21 @@ def get_model_for_path(model_path):
         app_label, model_name
     ).model_class()
 
-def get_all_models() -> set:
+def get_all_models() -> list:
     """
     Get's all models from settings.AIRTABLE_IMPORT_SETTINGS.
 
-    Returns a set (unique and unordered list of models)
+    Returns a list of models.
     """
     airtable_settings = getattr(settings, "AIRTABLE_IMPORT_SETTINGS", {})
-    validated_models = set()
+    validated_models = []
     for label, model_settings in airtable_settings.items():
         if model_settings.get("AIRTABLE_IMPORT_ALLOWED", True):
             label = label.lower()
             if "." in label:
                 try:
                     model = get_model_for_path(label)
-                    validated_models.add(model)
+                    validated_models.append(model)
                 except ObjectDoesNotExist:
                     raise CommandError(
                         "%r is not recognised as a model name." % label