Move tests to test

.circleci/config.yml

@@ -60,7 +60,7 @@ jobs:
       - image: cimg/python:3.8.11-browsers
     environment:
       PIPENV_VENV_IN_PROJECT: true
-      DJANGO_SETTINGS_MODULE: wagtail.tests.settings_ui
+      DJANGO_SETTINGS_MODULE: wagtail.test.settings_ui
     steps:
       - checkout
       - attach_workspace:
@@ -87,13 +87,13 @@ jobs:
           key: ui_tests-npm_integration-v1-{{ checksum "client/tests/integration/package-lock.json" }}
           paths:
             - client/tests/integration/node_modules
-      - run: pipenv run ./wagtail/tests/manage.py migrate
+      - run: pipenv run ./wagtail/test/manage.py migrate
       - run:
-          command: pipenv run ./wagtail/tests/manage.py runserver 0:8000
+          command: pipenv run ./wagtail/test/manage.py runserver 0:8000
           background: true
-      - run: pipenv run ./wagtail/tests/manage.py createcachetable
+      - run: pipenv run ./wagtail/test/manage.py createcachetable
       - run:
-          command: pipenv run ./wagtail/tests/manage.py createsuperuser --noinput
+          command: pipenv run ./wagtail/test/manage.py createsuperuser --noinput
           environment:
             DJANGO_SUPERUSER_EMAIL: admin@example.com
             DJANGO_SUPERUSER_USERNAME: admin

conftest.py

@@ -45,7 +45,7 @@ def pytest_configure(config):
 
     # Setup django after processing the pytest arguments so that the env
     # variables are available in the settings
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "wagtail.tests.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "wagtail.test.settings")
     django.setup()
 
     # Activate a language: This affects HTTP header HTTP_ACCEPT_LANGUAGE sent by
@@ -54,14 +54,14 @@ def pytest_configure(config):
 
     translation.activate("en")
 
-    from wagtail.tests.settings import MEDIA_ROOT, STATIC_ROOT
+    from wagtail.test.settings import MEDIA_ROOT, STATIC_ROOT
 
     shutil.rmtree(STATIC_ROOT, ignore_errors=True)
     shutil.rmtree(MEDIA_ROOT, ignore_errors=True)
 
 
 def pytest_unconfigure(config):
-    from wagtail.tests.settings import MEDIA_ROOT, STATIC_ROOT
+    from wagtail.test.settings import MEDIA_ROOT, STATIC_ROOT
 
     shutil.rmtree(STATIC_ROOT, ignore_errors=True)
     shutil.rmtree(MEDIA_ROOT, ignore_errors=True)

docs/advanced_topics/testing.rst

@@ -6,7 +6,7 @@ Testing your Wagtail site
 
 Wagtail comes with some utilities that simplify writing tests for your site.
 
-.. automodule:: wagtail.tests.utils
+.. automodule:: wagtail.test.utils
 
 
 WagtailPageTests
@@ -18,7 +18,7 @@ WagtailPageTests
 
     .. code-block:: python
 
-        from wagtail.tests.utils import WagtailPageTests
+        from wagtail.test.utils import WagtailPageTests
         from myapp.models import MyPage
 
         class MyPageTests(WagtailPageTests):
@@ -45,7 +45,7 @@ WagtailPageTests
 
         .. code-block:: python
 
-            from wagtail.tests.utils.form_data import nested_form_data, streamfield
+            from wagtail.test.utils.form_data import nested_form_data, streamfield
 
             def test_can_create_content_page(self):
                 # Get the HomePage
@@ -94,7 +94,7 @@ WagtailPageTests
 Form data helpers
 =================
 
-.. automodule:: wagtail.tests.utils.form_data
+.. automodule:: wagtail.test.utils.form_data
 
    .. autofunction:: nested_form_data
 

docs/conf.py

@@ -39,7 +39,7 @@ sys.path.insert(0, os.path.abspath(".."))
 
 # Autodoc may need to import some models modules which require django settings
 # be configured
-os.environ["DJANGO_SETTINGS_MODULE"] = "wagtail.tests.settings"
+os.environ["DJANGO_SETTINGS_MODULE"] = "wagtail.test.settings"
 django.setup()
 
 # Use SQLite3 database engine so it doesn't attempt to use psycopg2 on RTD

docs/contributing/developing.rst

@@ -102,7 +102,7 @@ You can create migrations for the test app by running the following from the Wag
 
 .. code-block:: console
 
-    $ django-admin makemigrations --settings=wagtail.tests.settings
+    $ django-admin makemigrations --settings=wagtail.test.settings
 
 
 Testing against PostgreSQL
@@ -188,12 +188,12 @@ Our end-to-end browser testing suite also uses `Jest <https://jestjs.io/>`_, com
 
 .. code-block:: console
 
-    $ export DJANGO_SETTINGS_MODULE=wagtail.tests.settings_ui
+    $ export DJANGO_SETTINGS_MODULE=wagtail.test.settings_ui
     $ # Assumes the current environment contains a valid installation of Wagtail for local development.
-    $ ./wagtail/tests/manage.py migrate
-    $ ./wagtail/tests/manage.py createcachetable
-    $ DJANGO_SUPERUSER_EMAIL=admin@example.com DJANGO_SUPERUSER_USERNAME=admin DJANGO_SUPERUSER_PASSWORD=changeme ./wagtail/tests/manage.py createsuperuser --noinput
-    $ ./wagtail/tests/manage.py runserver 0:8000
+    $ ./wagtail/test/manage.py migrate
+    $ ./wagtail/test/manage.py createcachetable
+    $ DJANGO_SUPERUSER_EMAIL=admin@example.com DJANGO_SUPERUSER_USERNAME=admin DJANGO_SUPERUSER_PASSWORD=changeme ./wagtail/test/manage.py createsuperuser --noinput
+    $ ./wagtail/test/manage.py runserver 0:8000
     $ npm --prefix client/tests/integration install
     $ npm run test:integration
 
@@ -289,7 +289,7 @@ Wagtail’s UI component library is built with `Storybook <https://storybook.js.
 
 .. code-block:: console
 
-    $ export DJANGO_SETTINGS_MODULE=wagtail.tests.settings_ui
+    $ export DJANGO_SETTINGS_MODULE=wagtail.test.settings_ui
     $ # Assumes the current environment contains a valid installation of Wagtail for local development.
     $ ./wagtail/tests/manage.py migrate
     $ ./wagtail/tests/manage.py createcachetable

docs/releases/2.0.rst

@@ -233,7 +233,7 @@ Wagtail now provides a set of helper functions for constructing form data: see :
 
 .. code-block:: python
 
-  from wagtail.tests.utils.form_data import rich_text
+  from wagtail.test.utils.form_data import rich_text
 
   self.assertCanCreate(root_page, ContentPage, {
       'title': 'About us',

runtests.py

@@ -8,7 +8,7 @@ import warnings
 
 from django.core.management import execute_from_command_line
 
-os.environ["DJANGO_SETTINGS_MODULE"] = "wagtail.tests.settings"
+os.environ["DJANGO_SETTINGS_MODULE"] = "wagtail.test.settings"
 
 
 def make_parser():
@@ -92,7 +92,7 @@ def runtests():
     try:
         execute_from_command_line(argv)
     finally:
-        from wagtail.tests.settings import MEDIA_ROOT, STATIC_ROOT
+        from wagtail.test.settings import MEDIA_ROOT, STATIC_ROOT
 
         shutil.rmtree(STATIC_ROOT, ignore_errors=True)
         shutil.rmtree(MEDIA_ROOT, ignore_errors=True)

wagtail/admin/tests/api/test_pages.py

@@ -10,8 +10,8 @@ from django.utils import timezone
 from wagtail.api.v2.tests.test_pages import TestPageDetail, TestPageListing
 from wagtail.core import hooks
 from wagtail.core.models import GroupPagePermission, Locale, Page, PageLogEntry
-from wagtail.tests.demosite import models
-from wagtail.tests.testapp.models import EventIndex, EventPage, SimplePage, StreamPage
+from wagtail.test.demosite import models
+from wagtail.test.testapp.models import EventIndex, EventPage, SimplePage, StreamPage
 from wagtail.users.models import UserProfile
 
 from .utils import AdminAPITestCase

wagtail/admin/tests/api/utils.py

@@ -1,6 +1,6 @@
 from django.test import TestCase
 
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class AdminAPITestCase(TestCase, WagtailTestUtils):

wagtail/admin/tests/benches.py

@@ -5,9 +5,9 @@ from django.urls import reverse
 from django.utils import timezone
 
 from wagtail.core.models import Page, Site
-from wagtail.tests.benchmark import Benchmark
-from wagtail.tests.testapp.models import SingleEventPage, StreamPage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.benchmark import Benchmark
+from wagtail.test.testapp.models import SingleEventPage, StreamPage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class BenchPageExplorerWith50LargePages(Benchmark, WagtailTestUtils, TestCase):

wagtail/admin/tests/pages/test_bulk_actions/test_bulk_action.py

@@ -1,7 +1,7 @@
 from django.test import TestCase
 from django.urls import reverse
 
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestBulkActionDispatcher(TestCase, WagtailTestUtils):

wagtail/admin/tests/pages/test_bulk_actions/test_bulk_delete.py

@@ -10,8 +10,8 @@ from django.urls import reverse
 from wagtail.admin.views.pages.bulk_actions.page_bulk_action import PageBulkAction
 from wagtail.core.models import Page
 from wagtail.core.signals import page_unpublished
-from wagtail.tests.testapp.models import SimplePage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestBulkDelete(TestCase, WagtailTestUtils):

wagtail/admin/tests/pages/test_bulk_actions/test_bulk_move.py

@@ -9,8 +9,8 @@ from django.urls import reverse
 from wagtail.admin.views.pages.bulk_actions.page_bulk_action import PageBulkAction
 from wagtail.core.models import Page
 from wagtail.core.signals import post_page_move, pre_page_move
-from wagtail.tests.testapp.models import BusinessChild, SimplePage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import BusinessChild, SimplePage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestBulkMove(TestCase, WagtailTestUtils):

wagtail/admin/tests/pages/test_bulk_actions/test_bulk_publish.py

@@ -9,8 +9,8 @@ from django.utils.translation import gettext_lazy as _
 from wagtail.admin.views.pages.bulk_actions.page_bulk_action import PageBulkAction
 from wagtail.core.models import Page
 from wagtail.core.signals import page_published
-from wagtail.tests.testapp.models import SimplePage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestBulkPublish(TestCase, WagtailTestUtils):

wagtail/admin/tests/pages/test_bulk_actions/test_bulk_unpublish.py

@@ -9,8 +9,8 @@ from django.utils.translation import gettext_lazy as _
 from wagtail.admin.views.pages.bulk_actions.page_bulk_action import PageBulkAction
 from wagtail.core.models import Page
 from wagtail.core.signals import page_unpublished
-from wagtail.tests.testapp.models import SimplePage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestBulkUnpublish(TestCase, WagtailTestUtils):

wagtail/admin/tests/pages/test_content_type_use_view.py

@@ -2,8 +2,8 @@ from django.test import TestCase
 from django.urls import reverse
 from django.utils.http import urlencode
 
-from wagtail.tests.testapp.models import EventPage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import EventPage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestContentTypeUse(TestCase, WagtailTestUtils):

wagtail/admin/tests/pages/test_convert_alias.py

@@ -3,8 +3,8 @@ from django.test import TestCase
 from django.urls import reverse
 
 from wagtail.core.models import Page, PageLogEntry
-from wagtail.tests.testapp.models import SimplePage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestConvertAlias(TestCase, WagtailTestUtils):

wagtail/admin/tests/pages/test_copy_page.py

@@ -4,8 +4,8 @@ from django.test import TestCase
 from django.urls import reverse
 
 from wagtail.core.models import GroupPagePermission, Page
-from wagtail.tests.testapp.models import SimplePage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestPageCopy(TestCase, WagtailTestUtils):

wagtail/admin/tests/pages/test_create_page.py

@@ -12,7 +12,7 @@ from django.utils.translation import gettext_lazy as _
 from wagtail.admin.tests.pages.timestamps import submittable_timestamp
 from wagtail.core.models import GroupPagePermission, Locale, Page, PageRevision
 from wagtail.core.signals import page_published
-from wagtail.tests.testapp.models import (
+from wagtail.test.testapp.models import (
     BusinessChild,
     BusinessIndex,
     BusinessSubIndex,
@@ -24,7 +24,7 @@ from wagtail.tests.testapp.models import (
     StandardChild,
     StandardIndex,
 )
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestPageCreation(TestCase, WagtailTestUtils):

wagtail/admin/tests/pages/test_dashboard.py

@@ -4,8 +4,8 @@ from django.urls import reverse
 
 from wagtail.admin.views.home import RecentEditsPanel
 from wagtail.core.models import Page
-from wagtail.tests.testapp.models import SimplePage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestRecentEditsPanel(TestCase, WagtailTestUtils):

wagtail/admin/tests/pages/test_delete_page.py

@@ -8,8 +8,8 @@ from django.urls import reverse
 
 from wagtail.core.models import Page
 from wagtail.core.signals import page_unpublished
-from wagtail.tests.testapp.models import SimplePage, StandardChild, StandardIndex
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage, StandardChild, StandardIndex
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestPageDelete(TestCase, WagtailTestUtils):

wagtail/admin/tests/pages/test_edit_page.py

@@ -27,7 +27,7 @@ from wagtail.core.models import (
     Site,
 )
 from wagtail.core.signals import page_published
-from wagtail.tests.testapp.models import (
+from wagtail.test.testapp.models import (
     EVENT_AUDIENCE_CHOICES,
     Advert,
     AdvertPlacement,
@@ -41,8 +41,8 @@ from wagtail.tests.testapp.models import (
     StandardIndex,
     TaggedPage,
 )
-from wagtail.tests.utils import WagtailTestUtils
-from wagtail.tests.utils.form_data import inline_formset, nested_form_data
+from wagtail.test.utils import WagtailTestUtils
+from wagtail.test.utils.form_data import inline_formset, nested_form_data
 from wagtail.users.models import UserProfile
 
 

wagtail/admin/tests/pages/test_explorer_view.py

@@ -7,8 +7,8 @@ from django.urls import reverse
 from wagtail.admin.tests.pages.timestamps import local_datetime
 from wagtail.core import hooks
 from wagtail.core.models import GroupPagePermission, Locale, Page
-from wagtail.tests.testapp.models import SimplePage, SingleEventPage, StandardIndex
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage, SingleEventPage, StandardIndex
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestPageExplorer(TestCase, WagtailTestUtils):

wagtail/admin/tests/pages/test_moderation.py

@@ -11,8 +11,8 @@ from django.urls import reverse
 
 from wagtail.core.models import Page, PageRevision
 from wagtail.core.signals import page_published
-from wagtail.tests.testapp.models import SimplePage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage
+from wagtail.test.utils import WagtailTestUtils
 from wagtail.users.models import UserProfile
 
 

wagtail/admin/tests/pages/test_move_page.py

@@ -10,8 +10,8 @@ from django.urls import reverse
 from wagtail.admin.navigation import get_explorable_root_page
 from wagtail.core.models import Page
 from wagtail.core.signals import post_page_move, pre_page_move
-from wagtail.tests.testapp.models import SimplePage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestPageMove(TestCase, WagtailTestUtils):

wagtail/admin/tests/pages/test_page_locking.py

@@ -4,8 +4,8 @@ from django.urls import reverse
 from django.utils import timezone
 
 from wagtail.core.models import Page
-from wagtail.tests.testapp.models import SimplePage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestLocking(TestCase, WagtailTestUtils):

wagtail/admin/tests/pages/test_page_search.py

@@ -5,8 +5,8 @@ from django.urls import reverse
 from wagtail.admin.tests.pages.timestamps import local_datetime
 from wagtail.core.models import Page
 from wagtail.search.index import SearchField
-from wagtail.tests.testapp.models import SimplePage, SingleEventPage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage, SingleEventPage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestPageSearch(TestCase, WagtailTestUtils):

wagtail/admin/tests/pages/test_preview.py

@@ -10,13 +10,8 @@ from freezegun import freeze_time
 from wagtail.admin.edit_handlers import FieldPanel, ObjectList, TabbedInterface
 from wagtail.admin.views.pages.preview import PreviewOnEdit
 from wagtail.core.models import Page
-from wagtail.tests.testapp.models import (
-    EventCategory,
-    EventPage,
-    SimplePage,
-    StreamPage,
-)
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import EventCategory, EventPage, SimplePage, StreamPage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestIssue2599(TestCase, WagtailTestUtils):

wagtail/admin/tests/pages/test_revisions.py

@@ -7,12 +7,12 @@ from freezegun import freeze_time
 
 from wagtail.admin.tests.pages.timestamps import local_datetime
 from wagtail.core.models import Page
-from wagtail.tests.testapp.models import (
+from wagtail.test.testapp.models import (
     EventPage,
     FormClassAdditionalFieldPage,
     SecretPage,
 )
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestRevisions(TestCase, WagtailTestUtils):

wagtail/admin/tests/pages/test_unpublish_page.py

@@ -8,8 +8,8 @@ from django.utils.translation import gettext_lazy as _
 
 from wagtail.core.models import Page
 from wagtail.core.signals import page_unpublished
-from wagtail.tests.testapp.models import SimplePage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestPageUnpublish(TestCase, WagtailTestUtils):

wagtail/admin/tests/pages/test_view_draft.py

@@ -4,8 +4,8 @@ from django.test import TestCase
 from django.urls import reverse
 
 from wagtail.core.models import Page
-from wagtail.tests.testapp.models import SimplePage, StreamPage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage, StreamPage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestDraftAccess(TestCase, WagtailTestUtils):

wagtail/admin/tests/pages/test_workflow_history.py

@@ -3,7 +3,7 @@ from django.test import TestCase
 from django.urls import reverse
 
 from wagtail.core.models import Page
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestWorkflowHistoryDetail(TestCase, WagtailTestUtils):

wagtail/admin/tests/test_account_management.py

@@ -18,7 +18,7 @@ from wagtail.admin.localization import (
 )
 from wagtail.admin.views.account import account, profile_tab
 from wagtail.images.tests.utils import get_test_image_file
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 from wagtail.users.models import UserProfile
 
 

wagtail/admin/tests/test_admin_search.py

@@ -7,7 +7,7 @@ from django.test import RequestFactory, TestCase
 from django.urls import reverse
 
 from wagtail.admin.auth import user_has_any_page_permission
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class BaseSearchAreaTestCase(WagtailTestUtils, TestCase):

wagtail/admin/tests/test_audit_log.py

@@ -12,8 +12,8 @@ from wagtail.core.models import (
     PageLogEntry,
     PageViewRestriction,
 )
-from wagtail.tests.testapp.models import SimplePage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestAuditLogAdmin(TestCase, WagtailTestUtils):

wagtail/admin/tests/test_buttons_hooks.py

@@ -6,7 +6,7 @@ from wagtail.admin import widgets as wagtailadmin_widgets
 from wagtail.admin.wagtail_hooks import page_listing_more_buttons
 from wagtail.core import hooks
 from wagtail.core.models import Page
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class PagePerms:

wagtail/admin/tests/test_collections_views.py

@@ -6,7 +6,7 @@ from django.urls import reverse
 from wagtail.admin.admin_url_finder import AdminURLFinder
 from wagtail.core.models import Collection, GroupCollectionPermission
 from wagtail.documents.models import Document
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class CollectionInstanceTestUtils:

wagtail/admin/tests/test_compare.py

@@ -7,7 +7,7 @@ from wagtail.admin import compare
 from wagtail.core.blocks import StreamValue
 from wagtail.images import get_image_model
 from wagtail.images.tests.utils import get_test_image_file
-from wagtail.tests.testapp.models import (
+from wagtail.test.testapp.models import (
     AdvertWithCustomPrimaryKey,
     EventCategory,
     EventPage,

wagtail/admin/tests/test_edit_handlers.py

@@ -33,8 +33,8 @@ from wagtail.admin.widgets import (
     AdminPageChooser,
 )
 from wagtail.core.models import Comment, CommentReply, Page, Site
-from wagtail.tests.testapp.forms import ValidatedPageForm
-from wagtail.tests.testapp.models import (
+from wagtail.test.testapp.forms import ValidatedPageForm
+from wagtail.test.testapp.models import (
     EventPage,
     EventPageChooserModel,
     EventPageSpeaker,
@@ -44,7 +44,7 @@ from wagtail.tests.testapp.models import (
     SimplePage,
     ValidatedPage,
 )
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestGetFormForModel(TestCase):
@@ -284,7 +284,7 @@ class TestPageEditHandlers(TestCase):
         handler_handler_repr = repr(edit_handler)
 
         self.assertIn(
-            "model=<class 'wagtail.tests.testapp.models.ValidatedPage'>",
+            "model=<class 'wagtail.test.testapp.models.ValidatedPage'>",
             handler_handler_repr,
         )
         self.assertIn("instance=None", handler_handler_repr)
@@ -615,7 +615,7 @@ class TestFieldPanel(TestCase):
         field_panel_repr = repr(field_panel)
 
         self.assertIn(
-            "model=<class 'wagtail.tests.testapp.models.EventPage'>", field_panel_repr
+            "model=<class 'wagtail.test.testapp.models.EventPage'>", field_panel_repr
         )
         self.assertIn("instance=None", field_panel_repr)
         self.assertIn("request=<WSGIRequest: GET '/'>", field_panel_repr)

wagtail/admin/tests/test_filters.py

@@ -4,7 +4,7 @@ from django.contrib.auth.models import Group
 from django.test import TestCase
 
 from wagtail.admin.filters import FilteredModelChoiceField
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 User = get_user_model()
 

wagtail/admin/tests/test_jinja2.py

@@ -4,7 +4,7 @@ from django.template import engines
 from django.test import TestCase
 
 from wagtail.core.models import PAGE_TEMPLATE_VAR, Page, Site
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestCoreJinja(TestCase, WagtailTestUtils):

wagtail/admin/tests/test_menu.py

@@ -4,7 +4,7 @@ from django.urls import reverse
 from wagtail.admin.menu import AdminOnlyMenuItem, Menu, MenuItem, SubmenuMenuItem
 from wagtail.admin.ui import sidebar
 from wagtail.core import hooks
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 def menu_item_hook(*args, cls=MenuItem, **kwargs):

wagtail/admin/tests/test_moderation_list.py

@@ -3,8 +3,8 @@ from django.test import TestCase
 from django.urls import reverse
 
 from wagtail.core.models import GroupPagePermission, Page
-from wagtail.tests.testapp.models import SimplePage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestModerationList(TestCase, WagtailTestUtils):

wagtail/admin/tests/test_navigation.py

@@ -7,7 +7,7 @@ from wagtail.admin.navigation import (
     get_explorable_root_page,
     get_pages_with_direct_explore_permission,
 )
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestExplorablePages(TestCase, WagtailTestUtils):

wagtail/admin/tests/test_page_chooser.py

@@ -7,13 +7,13 @@ from django.utils.http import urlencode
 
 from wagtail.admin.views.chooser import can_choose_page
 from wagtail.core.models import Locale, Page, UserPagePermissionsProxy
-from wagtail.tests.testapp.models import (
+from wagtail.test.testapp.models import (
     EventIndex,
     EventPage,
     SimplePage,
     SingleEventPage,
 )
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestChooserBrowse(TestCase, WagtailTestUtils):

wagtail/admin/tests/test_password_reset.py

@@ -5,7 +5,7 @@ from django.core import mail
 from django.test import TestCase, override_settings
 from django.urls import reverse
 
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestUserPasswordReset(TestCase, WagtailTestUtils):

wagtail/admin/tests/test_privacy.py

@@ -3,8 +3,8 @@ from django.test import TestCase
 from django.urls import reverse
 
 from wagtail.core.models import Page, PageViewRestriction
-from wagtail.tests.testapp.models import SimplePage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestSetPrivacyView(TestCase, WagtailTestUtils):

wagtail/admin/tests/test_reports_views.py

@@ -12,7 +12,7 @@ from openpyxl import load_workbook
 
 from wagtail.admin.views.mixins import ExcelDateFormatter
 from wagtail.core.models import Page, PageLogEntry
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestLockedPagesView(TestCase, WagtailTestUtils):

wagtail/admin/tests/test_rich_text.py

@@ -12,9 +12,9 @@ from wagtail.admin.rich_text.editors.draftail.features import Feature
 from wagtail.core.blocks import RichTextBlock
 from wagtail.core.models import Page, get_page_models
 from wagtail.core.rich_text import RichText
-from wagtail.tests.testapp.models import SingleEventPage
-from wagtail.tests.testapp.rich_text import CustomRichTextArea, LegacyRichTextArea
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SingleEventPage
+from wagtail.test.testapp.rich_text import CustomRichTextArea, LegacyRichTextArea
+from wagtail.test.utils import WagtailTestUtils
 
 
 class BaseRichTextEditHandlerTestCase(TestCase):
@@ -24,7 +24,7 @@ class BaseRichTextEditHandlerTestCase(TestCase):
         cached edit handlers should be cleared before and after each test run
         to ensure that no changes leak through to other tests.
         """
-        from wagtail.tests.testapp.models import DefaultRichBlockFieldPage
+        from wagtail.test.testapp.models import DefaultRichBlockFieldPage
 
         rich_text_block = (
             DefaultRichBlockFieldPage.get_edit_handler()
@@ -58,7 +58,7 @@ class TestGetRichTextEditorWidget(TestCase):
 
     @override_settings(
         WAGTAILADMIN_RICH_TEXT_EDITORS={
-            "default": {"WIDGET": "wagtail.tests.testapp.rich_text.CustomRichTextArea"},
+            "default": {"WIDGET": "wagtail.test.testapp.rich_text.CustomRichTextArea"},
         }
     )
     def test_overridden_default_editor(self):
@@ -66,7 +66,7 @@ class TestGetRichTextEditorWidget(TestCase):
 
     @override_settings(
         WAGTAILADMIN_RICH_TEXT_EDITORS={
-            "custom": {"WIDGET": "wagtail.tests.testapp.rich_text.CustomRichTextArea"},
+            "custom": {"WIDGET": "wagtail.test.testapp.rich_text.CustomRichTextArea"},
         }
     )
     def test_custom_editor_without_default(self):
@@ -75,8 +75,8 @@ class TestGetRichTextEditorWidget(TestCase):
 
     @override_settings(
         WAGTAILADMIN_RICH_TEXT_EDITORS={
-            "default": {"WIDGET": "wagtail.tests.testapp.rich_text.LegacyRichTextArea"},
-            "custom": {"WIDGET": "wagtail.tests.testapp.rich_text.CustomRichTextArea"},
+            "default": {"WIDGET": "wagtail.test.testapp.rich_text.LegacyRichTextArea"},
+            "custom": {"WIDGET": "wagtail.test.testapp.rich_text.CustomRichTextArea"},
         }
     )
     def test_custom_editor_with_default(self):
@@ -196,7 +196,7 @@ class TestDraftailFeatureMedia(BaseRichTextEditHandlerTestCase, WagtailTestUtils
 
 @override_settings(
     WAGTAILADMIN_RICH_TEXT_EDITORS={
-        "default": {"WIDGET": "wagtail.tests.testapp.rich_text.LegacyRichTextArea"},
+        "default": {"WIDGET": "wagtail.test.testapp.rich_text.LegacyRichTextArea"},
     }
 )
 class TestOverriddenDefaultRichText(BaseRichTextEditHandlerTestCase, WagtailTestUtils):
@@ -245,7 +245,7 @@ class TestOverriddenDefaultRichText(BaseRichTextEditHandlerTestCase, WagtailTest
         "default": {
             "WIDGET": "wagtail.admin.tests.test_rich_text.TestCustomDefaultRichText"
         },
-        "custom": {"WIDGET": "wagtail.tests.testapp.rich_text.CustomRichTextArea"},
+        "custom": {"WIDGET": "wagtail.test.testapp.rich_text.CustomRichTextArea"},
     }
 )
 class TestCustomDefaultRichText(BaseRichTextEditHandlerTestCase, WagtailTestUtils):

wagtail/admin/tests/test_site_summary.py

@@ -4,8 +4,8 @@ from django.urls import reverse
 
 from wagtail.admin.site_summary import PagesSummaryItem
 from wagtail.core.models import GroupPagePermission, Page, Site
-from wagtail.tests.testapp.models import SimplePage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestPagesSummary(TestCase, WagtailTestUtils):

wagtail/admin/tests/test_templatetags.py

@@ -25,7 +25,7 @@ from wagtail.admin.templatetags.wagtailadmin_tags import (
 from wagtail.admin.ui.components import Component
 from wagtail.core.models import Locale
 from wagtail.images.tests.utils import get_test_image_file
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 from wagtail.users.models import UserProfile
 
 

wagtail/admin/tests/test_userbar.py

@@ -5,8 +5,8 @@ from django.test.client import RequestFactory
 from django.urls import reverse
 
 from wagtail.core.models import PAGE_TEMPLATE_VAR, Page
-from wagtail.tests.testapp.models import BusinessChild, BusinessIndex
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import BusinessChild, BusinessIndex
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestUserbarTag(TestCase, WagtailTestUtils):

wagtail/admin/tests/test_views.py

@@ -2,7 +2,7 @@ from django.test import TestCase, override_settings
 from django.urls import reverse
 
 from wagtail.core.models import Page
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestLoginView(TestCase, WagtailTestUtils):

wagtail/admin/tests/test_widgets.py

@@ -7,8 +7,8 @@ from django.test.utils import override_settings
 from wagtail.admin import widgets
 from wagtail.admin.forms.tags import TagField
 from wagtail.core.models import Page
-from wagtail.tests.testapp.forms import AdminStarDateInput
-from wagtail.tests.testapp.models import EventPage, RestaurantTag, SimplePage
+from wagtail.test.testapp.forms import AdminStarDateInput
+from wagtail.test.testapp.models import EventPage, RestaurantTag, SimplePage
 
 
 class TestAdminPageChooserWidget(TestCase):

wagtail/admin/tests/test_workflows.py

@@ -22,8 +22,8 @@ from wagtail.core.models import (
     WorkflowTask,
 )
 from wagtail.core.signals import page_published
-from wagtail.tests.testapp.models import SimplePage, SimpleTask
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage, SimpleTask
+from wagtail.test.utils import WagtailTestUtils
 from wagtail.users.models import UserProfile
 
 

wagtail/admin/tests/tests.py

@@ -17,8 +17,8 @@ from wagtail.admin.auth import user_has_any_page_permission
 from wagtail.admin.mail import send_mail
 from wagtail.admin.menu import MenuItem
 from wagtail.core.models import Page
-from wagtail.tests.testapp.models import RestaurantTag
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import RestaurantTag
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestHome(TestCase, WagtailTestUtils):

wagtail/admin/tests/ui/test_sidebar.py

@@ -13,7 +13,7 @@ from wagtail.admin.ui.sidebar import (
     WagtailBrandingModule,
 )
 from wagtail.core.telepath import JSContext
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestAdaptLinkMenuItem(TestCase):

wagtail/api/v2/tests/test_pages.py

@@ -12,9 +12,9 @@ from rest_framework.test import APIClient
 from wagtail.api.v2 import signal_handlers
 from wagtail.core.models import Locale, Page, Site
 from wagtail.core.models.view_restrictions import BaseViewRestriction
-from wagtail.tests.demosite import models
-from wagtail.tests.testapp.models import StreamPage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.demosite import models
+from wagtail.test.testapp.models import StreamPage
+from wagtail.test.utils import WagtailTestUtils
 
 
 def get_total_page_count():

wagtail/contrib/forms/tests/test_forms.py

@@ -5,7 +5,7 @@ from django.test import TestCase
 from wagtail.contrib.forms.forms import FormBuilder
 from wagtail.contrib.forms.utils import get_field_clean_name
 from wagtail.core.models import Page
-from wagtail.tests.testapp.models import (
+from wagtail.test.testapp.models import (
     ExtendedFormField,
     FormField,
     FormPage,

wagtail/contrib/forms/tests/test_models.py

@@ -15,7 +15,7 @@ from wagtail.contrib.forms.tests.utils import (
     make_types_test_form_page,
 )
 from wagtail.core.models import Page
-from wagtail.tests.testapp.models import (
+from wagtail.test.testapp.models import (
     CustomFormPageSubmission,
     ExtendedFormField,
     FormField,
@@ -23,7 +23,7 @@ from wagtail.tests.testapp.models import (
     FormPageWithCustomFormBuilder,
     JadeFormPage,
 )
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestFormSubmission(TestCase):

wagtail/contrib/forms/tests/test_views.py

@@ -19,7 +19,7 @@ from wagtail.contrib.forms.tests.utils import (
     make_form_page_with_custom_submission,
 )
 from wagtail.core.models import Locale, Page
-from wagtail.tests.testapp.models import (
+from wagtail.test.testapp.models import (
     CustomFormPageSubmission,
     ExtendedFormField,
     FormField,
@@ -30,7 +30,7 @@ from wagtail.tests.testapp.models import (
     FormPageWithCustomSubmission,
     FormPageWithCustomSubmissionListView,
 )
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestFormResponsesPanel(TestCase):

wagtail/contrib/forms/tests/utils.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from wagtail.core.models import Page
-from wagtail.tests.testapp.models import (
+from wagtail.test.testapp.models import (
     FormField,
     FormFieldWithCustomSubmission,
     FormPage,

wagtail/contrib/frontend_cache/tests.py

@@ -18,7 +18,7 @@ from wagtail.contrib.frontend_cache.backends import (
 )
 from wagtail.contrib.frontend_cache.utils import get_backends
 from wagtail.core.models import Page
-from wagtail.tests.testapp.models import EventIndex
+from wagtail.test.testapp.models import EventIndex
 
 from .utils import (
     PurgeBatch,
@@ -525,7 +525,7 @@ class TestCachePurgingSignals(TestCase):
         self.assertEqual(PURGED_URLS, [])
 
     @override_settings(
-        ROOT_URLCONF="wagtail.tests.urls_multilang",
+        ROOT_URLCONF="wagtail.test.urls_multilang",
         LANGUAGE_CODE="en",
         WAGTAILFRONTENDCACHE_LANGUAGES=["en", "fr", "pt-br"],
     )
@@ -547,7 +547,7 @@ class TestCachePurgingSignals(TestCase):
         )
 
     @override_settings(
-        ROOT_URLCONF="wagtail.tests.urls_multilang",
+        ROOT_URLCONF="wagtail.test.urls_multilang",
         LANGUAGE_CODE="en",
         WAGTAIL_I18N_ENABLED=True,
         WAGTAIL_CONTENT_LANGUAGES=[("en", "English"), ("fr", "French")],
@@ -568,7 +568,7 @@ class TestCachePurgingSignals(TestCase):
         )
 
     @override_settings(
-        ROOT_URLCONF="wagtail.tests.urls_multilang",
+        ROOT_URLCONF="wagtail.test.urls_multilang",
         LANGUAGE_CODE="en",
         WAGTAIL_CONTENT_LANGUAGES=[("en", "English"), ("fr", "French")],
     )

wagtail/contrib/modeladmin/tests/test_modeladmin_edit_handlers.py

@@ -4,9 +4,9 @@ from django.test import RequestFactory, TestCase
 
 from wagtail.admin.edit_handlers import FieldPanel, ObjectList, TabbedInterface
 from wagtail.contrib.modeladmin.views import CreateView
-from wagtail.tests.modeladmintest.models import Person
-from wagtail.tests.modeladmintest.wagtail_hooks import PersonAdmin
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.modeladmintest.models import Person
+from wagtail.test.modeladmintest.wagtail_hooks import PersonAdmin
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestExtractPanelDefinitionsFromModelAdmin(TestCase, WagtailTestUtils):

wagtail/contrib/modeladmin/tests/test_page_modeladmin.py

@@ -2,8 +2,8 @@ from django.contrib.auth.models import Group, Permission
 from django.test import TestCase
 
 from wagtail.core.models import GroupPagePermission, Page
-from wagtail.tests.testapp.models import BusinessIndex, EventCategory, EventPage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import BusinessIndex, EventCategory, EventPage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestIndexView(TestCase, WagtailTestUtils):

wagtail/contrib/modeladmin/tests/test_search_handlers.py

@@ -6,7 +6,7 @@ from wagtail.contrib.modeladmin.helpers import (
     DjangoORMSearchHandler,
     WagtailBackendSearchHandler,
 )
-from wagtail.tests.modeladmintest.models import Book
+from wagtail.test.modeladmintest.models import Book
 
 
 class FakeSearchBackend:

wagtail/contrib/modeladmin/tests/test_simple_modeladmin.py

@@ -15,15 +15,15 @@ from wagtail.contrib.modeladmin.helpers.search import DjangoORMSearchHandler
 from wagtail.core.models import ModelLogEntry, Page
 from wagtail.images.models import Image
 from wagtail.images.tests.utils import get_test_image_file
-from wagtail.tests.modeladmintest.models import (
+from wagtail.test.modeladmintest.models import (
     Author,
     Book,
     Publisher,
     RelatedLink,
     Token,
 )
-from wagtail.tests.modeladmintest.wagtail_hooks import BookModelAdmin
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.modeladmintest.wagtail_hooks import BookModelAdmin
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestBookIndexView(TestCase, WagtailTestUtils):
@@ -338,7 +338,7 @@ class TestCreateView(TestCase, WagtailTestUtils):
 
     def test_clean_form_once(self):
         with mock.patch(
-            "wagtail.tests.modeladmintest.wagtail_hooks.PublisherModelAdminForm.clean"
+            "wagtail.test.modeladmintest.wagtail_hooks.PublisherModelAdminForm.clean"
         ) as mock_form_clean:
             response = self.client.post(
                 "/admin/modeladmintest/publisher/create/", {"name": ""}
@@ -540,7 +540,7 @@ class TestEditView(TestCase, WagtailTestUtils):
 
     def test_clean_form_once(self):
         with mock.patch(
-            "wagtail.tests.modeladmintest.wagtail_hooks.PublisherModelAdminForm.clean"
+            "wagtail.test.modeladmintest.wagtail_hooks.PublisherModelAdminForm.clean"
         ) as mock_form_clean:
             publisher = Publisher.objects.create(name="Sharper Collins")
 

wagtail/contrib/redirects/tests/test_import_admin_views.py

@@ -6,7 +6,7 @@ from django.urls import reverse
 
 from wagtail.contrib.redirects.models import Redirect
 from wagtail.core.models import Site
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 TEST_ROOT = os.path.abspath(os.path.dirname(__file__))
 

wagtail/contrib/redirects/tests/test_redirects.py

@@ -5,8 +5,8 @@ from django.urls import reverse
 from wagtail.admin.admin_url_finder import AdminURLFinder
 from wagtail.contrib.redirects import models
 from wagtail.core.models import Page, Site
-from wagtail.tests.routablepage.models import RoutablePageTest
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.routablepage.models import RoutablePageTest
+from wagtail.test.utils import WagtailTestUtils
 
 
 @override_settings(

wagtail/contrib/redirects/tests/test_reports_view.py

@@ -6,7 +6,7 @@ from openpyxl import load_workbook
 
 from wagtail.contrib.redirects.models import Redirect
 from wagtail.core.models import Site
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestRedirectReport(TestCase, WagtailTestUtils):

wagtail/contrib/redirects/tests/test_signal_handlers.py

@@ -5,9 +5,9 @@ from django.test import TestCase, override_settings
 from wagtail.contrib.redirects.models import Redirect
 from wagtail.core.coreutils import get_dummy_request
 from wagtail.core.models import Page, Site
-from wagtail.tests.routablepage.models import RoutablePageTest
-from wagtail.tests.testapp.models import EventIndex
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.routablepage.models import RoutablePageTest
+from wagtail.test.testapp.models import EventIndex
+from wagtail.test.utils import WagtailTestUtils
 
 User = get_user_model()
 

wagtail/contrib/routable_page/tests.py

@@ -8,7 +8,7 @@ from wagtail.contrib.routable_page.templatetags.wagtailroutablepage_tags import
     routablepageurl,
 )
 from wagtail.core.models import Page, Site
-from wagtail.tests.routablepage.models import (
+from wagtail.test.routablepage.models import (
     RoutablePageTest,
     RoutablePageWithOverriddenIndexRouteTest,
 )

wagtail/contrib/search_promotions/tests.py

@@ -7,7 +7,7 @@ from wagtail.contrib.search_promotions.templatetags.wagtailsearchpromotions_tags
     get_search_promotions,
 )
 from wagtail.search.models import Query
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestSearchPromotions(TestCase):

wagtail/contrib/settings/tests/base.py

@@ -1,7 +1,7 @@
 from django.http import HttpRequest
 
 from wagtail.core.models import Page, Site
-from wagtail.tests.testapp.models import TestSetting
+from wagtail.test.testapp.models import TestSetting
 
 
 class SettingsTestMixin:

wagtail/contrib/settings/tests/test_admin.py

@@ -9,14 +9,14 @@ from wagtail.contrib.settings.registry import SettingMenuItem
 from wagtail.contrib.settings.views import get_setting_edit_handler
 from wagtail.core import hooks
 from wagtail.core.models import Page, Site
-from wagtail.tests.testapp.models import (
+from wagtail.test.testapp.models import (
     FileUploadSetting,
     IconSetting,
     PanelSettings,
     TabbedSettings,
     TestSetting,
 )
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestSettingMenu(TestCase, WagtailTestUtils):

wagtail/contrib/settings/tests/test_forms.py

@@ -2,7 +2,7 @@ from django.test import TestCase
 
 from wagtail.contrib.settings.forms import SiteSwitchForm
 from wagtail.core.models import Page, Site
-from wagtail.tests.testapp.models import TestSetting
+from wagtail.test.testapp.models import TestSetting
 
 
 class TestSiteSwitchFromSiteOrdering(TestCase):

wagtail/contrib/settings/tests/test_model.py

@@ -1,7 +1,7 @@
 from django.test import TestCase, override_settings
 
 from wagtail.core.models import Site
-from wagtail.tests.testapp.models import ImportantPages, TestSetting
+from wagtail.test.testapp.models import ImportantPages, TestSetting
 
 from .base import SettingsTestMixin
 

wagtail/contrib/settings/tests/test_register.py

@@ -2,8 +2,8 @@ from django.test import TestCase
 from django.urls import reverse
 
 from wagtail.contrib.settings.registry import Registry
-from wagtail.tests.testapp.models import NotYetRegisteredSetting
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import NotYetRegisteredSetting
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestRegister(TestCase, WagtailTestUtils):

wagtail/contrib/settings/tests/test_templates.py

@@ -4,7 +4,7 @@ from django.test import TestCase
 from django.test.utils import override_settings
 
 from wagtail.core.models import Site
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 from .base import SettingsTestMixin
 

wagtail/contrib/simple_translation/tests/test_forms.py

@@ -3,8 +3,8 @@ from django.test import TestCase, override_settings
 
 from wagtail.contrib.simple_translation.forms import SubmitTranslationForm
 from wagtail.core.models import Locale, Page
-from wagtail.tests.i18n.models import TestPage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.i18n.models import TestPage
+from wagtail.test.utils import WagtailTestUtils
 
 
 @override_settings(

wagtail/contrib/simple_translation/tests/test_migrations.py

@@ -1,7 +1,7 @@
 from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 
-from wagtail.tests.utils import TestCase
+from wagtail.test.utils import TestCase
 
 
 class TestMigrations(TestCase):

wagtail/contrib/simple_translation/tests/test_views.py

@@ -15,9 +15,9 @@ from wagtail.contrib.simple_translation.views import (
 from wagtail.core import hooks
 from wagtail.core.actions.copy_for_translation import ParentNotTranslatedError
 from wagtail.core.models import Locale, Page
-from wagtail.tests.i18n.models import TestPage
-from wagtail.tests.snippets.models import TranslatableSnippet
-from wagtail.tests.utils import TestCase, WagtailTestUtils
+from wagtail.test.i18n.models import TestPage
+from wagtail.test.snippets.models import TranslatableSnippet
+from wagtail.test.utils import TestCase, WagtailTestUtils
 
 
 @override_settings(

wagtail/contrib/simple_translation/tests/test_wagtail_hooks.py

@@ -9,8 +9,8 @@ from wagtail.contrib.simple_translation.wagtail_hooks import (
     register_submit_translation_permission,
 )
 from wagtail.core.models import Locale, Page
-from wagtail.tests.i18n.models import TestPage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.i18n.models import TestPage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class Utils(WagtailTestUtils, TestCase):

wagtail/contrib/sitemaps/tests.py

@@ -8,7 +8,7 @@ from django.test import RequestFactory, TestCase, override_settings
 from django.utils import timezone
 
 from wagtail.core.models import Page, PageViewRestriction, Site
-from wagtail.tests.testapp.models import EventIndex, SimplePage
+from wagtail.test.testapp.models import EventIndex, SimplePage
 
 from .sitemap_generator import Sitemap
 

wagtail/contrib/styleguide/tests.py

@@ -1,7 +1,7 @@
 from django.test import TestCase
 from django.urls import reverse
 
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestStyleGuide(TestCase, WagtailTestUtils):

wagtail/contrib/table_block/tests.py

@@ -8,8 +8,8 @@ from django.utils import translation
 from wagtail.contrib.table_block.blocks import DEFAULT_TABLE_OPTIONS, TableBlock
 from wagtail.core.blocks.field_block import FieldBlockAdapter
 from wagtail.core.models import Page
-from wagtail.tests.testapp.models import TableBlockStreamPage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import TableBlockStreamPage
+from wagtail.test.utils import WagtailTestUtils
 
 from .blocks import TableInput
 

wagtail/core/tests/test_audit_log.py

@@ -16,8 +16,8 @@ from wagtail.core.models import (
     Workflow,
     WorkflowTask,
 )
-from wagtail.tests.testapp.models import SimplePage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestAuditLogManager(TestCase, WagtailTestUtils):

wagtail/core/tests/test_blocks.py

@@ -22,10 +22,10 @@ from wagtail.core.blocks.stream_block import StreamBlockAdapter
 from wagtail.core.blocks.struct_block import StructBlockAdapter
 from wagtail.core.models import Page
 from wagtail.core.rich_text import RichText
-from wagtail.tests.testapp.blocks import LinkBlock as CustomLinkBlock
-from wagtail.tests.testapp.blocks import SectionBlock
-from wagtail.tests.testapp.models import EventPage, SimplePage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.blocks import LinkBlock as CustomLinkBlock
+from wagtail.test.testapp.blocks import SectionBlock
+from wagtail.test.testapp.models import EventPage, SimplePage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class FooStreamBlock(blocks.StreamBlock):
@@ -546,7 +546,7 @@ class TestRichTextBlock(TestCase):
         )
 
     def test_adapter(self):
-        from wagtail.tests.testapp.rich_text import CustomRichTextArea
+        from wagtail.test.testapp.rich_text import CustomRichTextArea
 
         block = blocks.RichTextBlock(editor="custom")
 

wagtail/core/tests/test_collection_permission_policies.py

@@ -10,7 +10,7 @@ from wagtail.core.permission_policies.collections import (
 )
 from wagtail.core.tests.test_permission_policies import PermissionPolicyTestUtils
 from wagtail.documents.models import Document
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class PermissionPolicyTestCase(PermissionPolicyTestUtils, TestCase, WagtailTestUtils):

wagtail/core/tests/test_hooks.py

@@ -1,7 +1,7 @@
 from django.test import TestCase
 
 from wagtail.core import hooks
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 def test_hook():

wagtail/core/tests/test_jinja2.py

@@ -7,7 +7,7 @@ from django.utils.safestring import mark_safe
 from wagtail import __version__
 from wagtail.core import blocks
 from wagtail.core.models import Page, Site
-from wagtail.tests.testapp.blocks import SectionBlock
+from wagtail.test.testapp.blocks import SectionBlock
 
 
 class TestCoreGlobalsAndFilters(TestCase):

wagtail/core/tests/test_locale_model.py

@@ -4,7 +4,7 @@ from django.utils import translation
 from django.utils.translation import gettext_lazy as _
 
 from wagtail.core.models import Locale, Page
-from wagtail.tests.i18n.models import TestPage
+from wagtail.test.i18n.models import TestPage
 
 
 def make_test_page(**kwargs):

wagtail/core/tests/test_management_commands.py

@@ -10,7 +10,7 @@ from django.utils import timezone
 
 from wagtail.core.models import Collection, Page, PageLogEntry, PageRevision
 from wagtail.core.signals import page_published, page_unpublished
-from wagtail.tests.testapp.models import EventPage, SecretPage, SimplePage
+from wagtail.test.testapp.models import EventPage, SecretPage, SimplePage
 
 
 class TestFixTreeCommand(TestCase):

wagtail/core/tests/test_page_model.py

@@ -27,7 +27,7 @@ from wagtail.core.models import (
     get_translatable_models,
 )
 from wagtail.core.signals import page_published
-from wagtail.tests.testapp.models import (
+from wagtail.test.testapp.models import (
     AbstractPage,
     Advert,
     AlwaysShowInMenusPage,
@@ -61,7 +61,7 @@ from wagtail.tests.testapp.models import (
     TaggedGrandchildPage,
     TaggedPage,
 )
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 def get_ct(model):
@@ -408,7 +408,7 @@ class TestRouting(TestCase):
             (second_events_site.id, "http://second-events.example.com", "/christmas/"),
         )
 
-    @override_settings(ROOT_URLCONF="wagtail.tests.non_root_urls")
+    @override_settings(ROOT_URLCONF="wagtail.test.non_root_urls")
     def test_urls_with_non_root_urlconf(self):
         default_site = Site.objects.get(is_default_site=True)
         homepage = Page.objects.get(url_path="/home/")
@@ -436,7 +436,7 @@ class TestRouting(TestCase):
         )
         self.assertEqual(christmas_page.get_site(), default_site)
 
-    @override_settings(ROOT_URLCONF="wagtail.tests.headless_urls")
+    @override_settings(ROOT_URLCONF="wagtail.test.headless_urls")
     def test_urls_headless(self):
         default_site = Site.objects.get(is_default_site=True)
         homepage = Page.objects.get(url_path="/home/")
@@ -523,7 +523,7 @@ class TestRouting(TestCase):
 
 
 @override_settings(
-    ROOT_URLCONF="wagtail.tests.urls_multilang",
+    ROOT_URLCONF="wagtail.test.urls_multilang",
     LANGUAGE_CODE="en",
     WAGTAIL_I18N_ENABLED=True,
     LANGUAGES=[
@@ -788,7 +788,7 @@ class TestServeView(TestCase):
         self.assertContains(response, "<h1>Christmas</h1>")
         self.assertContains(response, "<h2>Event</h2>")
 
-    @override_settings(ROOT_URLCONF="wagtail.tests.non_root_urls")
+    @override_settings(ROOT_URLCONF="wagtail.test.non_root_urls")
     def test_serve_with_non_root_urls(self):
         response = self.client.get("/site/events/christmas/")
 

wagtail/core/tests/test_page_permissions.py

@@ -14,7 +14,7 @@ from wagtail.core.models import (
     Workflow,
     WorkflowTask,
 )
-from wagtail.tests.testapp.models import (
+from wagtail.test.testapp.models import (
     BusinessSubIndex,
     EventIndex,
     EventPage,

wagtail/core/tests/test_page_privacy.py

@@ -2,7 +2,7 @@ from django.contrib.auth.models import Group
 from django.test import TestCase
 
 from wagtail.core.models import Page, PageViewRestriction
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestPagePrivacy(TestCase, WagtailTestUtils):

wagtail/core/tests/test_page_queryset.py

@@ -7,7 +7,7 @@ from django.test import TestCase
 from wagtail.core.models import Locale, Page, PageViewRestriction, Site
 from wagtail.core.signals import page_unpublished
 from wagtail.search.query import MATCH_ALL
-from wagtail.tests.testapp.models import (
+from wagtail.test.testapp.models import (
     EventPage,
     SimplePage,
     SingleEventPage,

wagtail/core/tests/test_permission_policies.py

@@ -10,7 +10,7 @@ from wagtail.core.permission_policies import (
 )
 from wagtail.images.models import Image
 from wagtail.images.tests.utils import get_test_image_file
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.utils import WagtailTestUtils
 
 
 class PermissionPolicyTestUtils:

wagtail/core/tests/test_rich_text.py

@@ -8,7 +8,7 @@ from wagtail.core.rich_text import RichText, expand_db_html
 from wagtail.core.rich_text.feature_registry import FeatureRegistry
 from wagtail.core.rich_text.pages import PageLinkHandler
 from wagtail.core.rich_text.rewriters import LinkRewriter, extract_attrs
-from wagtail.tests.testapp.models import EventPage
+from wagtail.test.testapp.models import EventPage
 
 
 class TestPageLinktypeHandler(TestCase):
@@ -35,7 +35,7 @@ class TestPageLinktypeHandler(TestCase):
         ("en", "English"),
         ("fr", "French"),
     ],
-    ROOT_URLCONF="wagtail.tests.urls_multilang",
+    ROOT_URLCONF="wagtail.test.urls_multilang",
 )
 class TestPageLinktypeHandlerWithI18N(TestCase):
     fixtures = ["test.json"]

wagtail/core/tests/test_signals.py

@@ -5,8 +5,8 @@ from django.test import TestCase
 
 from wagtail.core.models import Site
 from wagtail.core.signals import page_slug_changed
-from wagtail.tests.testapp.models import SimplePage
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.test.testapp.models import SimplePage
+from wagtail.test.utils import WagtailTestUtils
 
 
 class TestPageSlugChangedSignal(TestCase, WagtailTestUtils):