Housekeeping. Clean up testing and other bits

digitaloxford/settings/base.py

@@ -117,7 +117,7 @@
 
 DATABASES = {
     "default": {
-        "ENGINE": "django.db.backends.postgresql_psycopg2",
+        "ENGINE": "django.db.backends.postgresql",
         "NAME": os.getenv("DB_NAME", None),
         "USER": os.getenv("DB_USER", None),
         "PASSWORD": os.getenv("DB_PASSWORD", None),
@@ -192,7 +192,15 @@
 # ManifestStaticFilesStorage is recommended in production, to prevent outdated
 # Javascript / CSS assets being served from cache (e.g. after a Wagtail upgrade).
 # See https://docs.djangoproject.com/en/2.2/ref/contrib/staticfiles/#manifeststaticfilesstorage
-STATICFILES_STORAGE = "django.contrib.staticfiles.storage.ManifestStaticFilesStorage"
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "django.contrib.staticfiles.storage.ManifestStaticFilesStorage",
+    },
+}
+
 
 STATIC_ROOT = os.path.join(BASE_DIR, "static")
 STATIC_URL = "/static/"

digitaloxford/wsgi.py

@@ -8,10 +8,11 @@
 """
 
 import os
-from dotenv import load_dotenv
+
 from django.core.wsgi import get_wsgi_application
+from dotenv import load_dotenv
 
-dotenv_path = os.path.join(os.path.dirname(__file__), '.env')
+dotenv_path = os.path.join(os.path.dirname(__file__), ".env")
 load_dotenv(dotenv_path)
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "digitaloxford.settings.production")

home/models.py

@@ -1,13 +1,10 @@
 from django.conf import settings
 from django.db import models
 from django.utils.functional import cached_property
-from django.views.generic import TemplateView
 from taggit.models import Tag as TaggitTag
 from wagtail.admin.panels import FieldPanel
-from wagtail.contrib.settings.models import BaseSiteSetting, register_setting
 from wagtail.fields import RichTextField
-from wagtail.images.models import Image
-from wagtail.models import Page, Site
+from wagtail.models import Page
 from wagtail.snippets.models import register_snippet
 from wagtailseo.models import SeoMixin
 
@@ -81,21 +78,21 @@ class ModelCategory(models.Model):
         FieldPanel("slug"),
     ]
 
-    def __str__(self):
-        return self.name
-
     class Meta:
         ordering = ["name"]
         verbose_name = "Category"
         verbose_name_plural = "Categories"
 
-
-@register_snippet
-class ModelTag(TaggitTag):
     def __str__(self):
         return self.name
 
+
+@register_snippet
+class ModelTag(TaggitTag):
     class Meta:
         proxy = True
         verbose_name = "Tag"
         verbose_name_plural = "Tags"
+
+    def __str__(self):
+        return self.name

pyproject.toml

@@ -97,7 +97,7 @@ exclude_lines = [
 ]
 
 [tool.pytest.ini_options]
-DJANGO_SETTINGS_MODULE = "core.settings.test"
+DJANGO_SETTINGS_MODULE = "digitaloxford.settings.dev"
 addopts = "-v --nomigrations"
 # filterwarnings = ["ignore::DeprecationWarning"]
 testpaths = ["tests"]

tests/home_test.py

@@ -1,17 +1,13 @@
 from wagtail.test.utils import WagtailPageTestCase
 
-from jobs.models import JobIndexPage
+from home.models import BasicPage, HomePage
 from links.models import LinkIndexPage
 
-from .models import BasicPage, HomePage
-
 
 class HomePageTests(WagtailPageTestCase):
     def test_home_page_subpages(self):
         # A HomePage can only have other BasicPage and *IndexPage children
-        self.assertAllowedSubpageTypes(
-            HomePage, {BasicPage, LinkIndexPage, JobIndexPage}
-        )
+        self.assertAllowedSubpageTypes(HomePage, {BasicPage, LinkIndexPage})
 
     def test_cant_create_under_basic_page(self):
         # You can not create a HomePage under a BasicPage
@@ -27,6 +23,6 @@ def test_cant_create_under_link_index_page(self):
         # You can not create a BasicPage under the LinkIndexPage
         self.assertCanNotCreateAt(BasicPage, LinkIndexPage)
 
-    def test_cant_create_under_job_index_page(self):
-        # You can not create a BasicPage under the JobIndexPage
-        self.assertCanNotCreateAt(BasicPage, JobIndexPage)
+    # def test_cant_create_under_job_index_page(self):
+    #     # You can not create a BasicPage under the JobIndexPage
+    #     self.assertCanNotCreateAt(BasicPage, JobIndexPage)

tests/jobs_test.py

@@ -1,47 +1,46 @@
-from wagtail.test.utils import WagtailPageTestCase
+# from wagtail.test.utils import WagtailPageTestCase
 
-from home.models import BasicPage, HomePage
+# from home.models import BasicPage, HomePage
+# from jobs.models import JobIndexPage, JobPage, RecruiterPage
 
-from .models import JobIndexPage, JobPage, RecruiterPage
 
+# class JobIndexPageTests(WagtailPageTestCase):
+#     def test_can_create_under_home_page(self):
+#         # You can create a JobIndexPage under the HomePage
+#         self.assertCanCreateAt(HomePage, JobIndexPage)
 
-class JobIndexPageTests(WagtailPageTestCase):
-    def test_can_create_under_home_page(self):
-        # You can create a JobIndexPage under the HomePage
-        self.assertCanCreateAt(HomePage, JobIndexPage)
+#     def test_cant_create_under_basic_page(self):
+#         # You can not create a JobIndexPage under a BasicPage
+#         self.assertCanNotCreateAt(BasicPage, JobIndexPage)
 
-    def test_cant_create_under_basic_page(self):
-        # You can not create a JobIndexPage under a BasicPage
-        self.assertCanNotCreateAt(BasicPage, JobIndexPage)
 
+# class RecruiterPageTests(WagtailPageTestCase):
+#     def test_can_create_under_job_index_page(self):
+#         # You can create a RecruiterPage under a JobIndexPage
+#         self.assertCanCreateAt(JobIndexPage, RecruiterPage)
 
-class RecruiterPageTests(WagtailPageTestCase):
-    def test_can_create_under_job_index_page(self):
-        # You can create a RecruiterPage under a JobIndexPage
-        self.assertCanCreateAt(JobIndexPage, RecruiterPage)
+#     def test_cant_create_under_home_page(self):
+#         # You can not create a RecruiterPage under the HomePage
+#         self.assertCanNotCreateAt(HomePage, RecruiterPage)
 
-    def test_cant_create_under_home_page(self):
-        # You can not create a RecruiterPage under the HomePage
-        self.assertCanNotCreateAt(HomePage, RecruiterPage)
+#     def test_job_page_parent_pages(self):
+#         # A RecruiterPage can only be created under a JobIndexPage
+#         self.assertAllowedParentPageTypes(RecruiterPage, {JobIndexPage})
 
-    def test_job_page_parent_pages(self):
-        # A RecruiterPage can only be created under a JobIndexPage
-        self.assertAllowedParentPageTypes(RecruiterPage, {JobIndexPage})
 
+# class JobPageTests(WagtailPageTestCase):
+#     def test_can_create_under_recruiter_page(self):
+#         # You can create a JobPage under a RecruiterPage
+#         self.assertCanCreateAt(RecruiterPage, JobPage)
 
-class JobPageTests(WagtailPageTestCase):
-    def test_can_create_under_recruiter_page(self):
-        # You can create a JobPage under a RecruiterPage
-        self.assertCanCreateAt(RecruiterPage, JobPage)
+#     def test_job_page_parent_pages(self):
+#         # A JobPage can only be created under a RecruiterPage
+#         self.assertAllowedParentPageTypes(JobPage, {RecruiterPage})
 
-    def test_job_page_parent_pages(self):
-        # A JobPage can only be created under a RecruiterPage
-        self.assertAllowedParentPageTypes(JobPage, {RecruiterPage})
+#     def test_cant_create_under_home_page(self):
+#         # You can not create a JobPage under the HomePage
+#         self.assertCanNotCreateAt(HomePage, JobPage)
 
-    def test_cant_create_under_home_page(self):
-        # You can not create a JobPage under the HomePage
-        self.assertCanNotCreateAt(HomePage, JobPage)
-
-    def test_cant_create_under_job_index_page(self):
-        # You can not create a JobPage under the JobIndexPage
-        self.assertCanNotCreateAt(JobIndexPage, JobPage)
+#     def test_cant_create_under_job_index_page(self):
+#         # You can not create a JobPage under the JobIndexPage
+#         self.assertCanNotCreateAt(JobIndexPage, JobPage)

tests/links_test.py

@@ -1,8 +1,7 @@
 from wagtail.test.utils import WagtailPageTestCase
 
 from home.models import BasicPage, HomePage
-
-from .models import LinkIndexPage, LinkPage
+from links.models import LinkIndexPage, LinkPage
 
 
 class LinkIndexPageTests(WagtailPageTestCase):