Merge pull request #75 from cfpb/deprecate/wagtail-testapp

Deprecate reliance on Wagtail's testapp
cfpb · Aug 15, 2023 · d49b2f5 · d49b2f5
2 parents f8efa24 + 3943834
commit d49b2f5
Showing 1 changed file with 16 additions and 39 deletions.
diff --git a/wagtailflags/tests/settings.py b/wagtailflags/tests/settings.py
@@ -24,27 +24,6 @@
     },
 }
 
-WAGTAIL_APPS = (
-    "wagtail.contrib.forms",
-    "wagtail.contrib.modeladmin",
-    "wagtail.contrib.settings",
-    "wagtail.admin",
-    "wagtail.documents",
-    "wagtail.images",
-    "wagtail.snippets",
-    "wagtail.sites",
-    "wagtail.users",
-)
-
-WAGTAIL_APPS += (
-    "wagtail",
-    "wagtail.test.testapp",
-)
-WAGTAILADMIN_RICH_TEXT_EDITORS = {
-    "default": {"WIDGET": "wagtail.admin.rich_text.DraftailRichTextArea"},
-    "custom": {"WIDGET": "wagtail.test.testapp.rich_text.CustomRichTextArea"},
-}
-
 WAGTAILADMIN_BASE_URL = "http://localhost:8000"
 
 MIDDLEWARE = (
@@ -57,27 +36,25 @@
 )
 
 INSTALLED_APPS = (
+    "django.contrib.admin",
     "django.contrib.auth",
     "django.contrib.contenttypes",
+    "django.contrib.messages",
     "django.contrib.sessions",
-)
-
-
-INSTALLED_APPS = (
-    (
-        "django.contrib.admin",
-        "django.contrib.auth",
-        "django.contrib.contenttypes",
-        "django.contrib.messages",
-        "django.contrib.sessions",
-        "django.contrib.staticfiles",
-        "taggit",
-    )
-    + WAGTAIL_APPS
-    + (
-        "flags",
-        "wagtailflags",
-    )
+    "django.contrib.staticfiles",
+    "taggit",
+    "wagtail",
+    "wagtail.contrib.forms",
+    "wagtail.contrib.modeladmin",
+    "wagtail.contrib.settings",
+    "wagtail.admin",
+    "wagtail.documents",
+    "wagtail.images",
+    "wagtail.snippets",
+    "wagtail.sites",
+    "wagtail.users",
+    "flags",
+    "wagtailflags",
 )
 
 STATIC_URL = "/static/"