From 3943834761a9beb339b9160d33bb966bca0239df Mon Sep 17 00:00:00 2001
From: Andy Chosak <andy.chosak@cfpb.gov>
Date: Tue, 15 Aug 2023 08:49:09 -0400
Subject: [PATCH] Deprecate reliance on Wagtail's testapp

This commit removes the reference to wagtail.test.testapp from this
project's test settings. It is not used or needed, and was causing
issues testing Wagtail 4.2.4. See wagtail-sharing#66.

As part of this change I tidied up the settings INSTALLED_APPS.
---
 wagtailflags/tests/settings.py | 55 ++++++++++------------------------
 1 file changed, 16 insertions(+), 39 deletions(-)

diff --git a/wagtailflags/tests/settings.py b/wagtailflags/tests/settings.py
index 0bd72f7..cf9b9f3 100644
--- 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/"