move test settings into test folder

clinicedc · Aug 13, 2024 · 0b27f15 · 0b27f15
1 parent ea9b991
commit 0b27f15
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 79 deletions.
diff --git a/edc_qareports/admin/list_filters.py b/edc_qareports/admin/list_filters.py
@@ -2,9 +2,8 @@
 from django.db.models import Count, QuerySet
 from edc_constants.constants import FEEDBACK, NEW
 
-from edc_qareports.models import QaReportNote
-
 from ..choices import QA_NOTE_STATUS
+from ..models import QaReportNote
 
 
 class QaNoteStatusListFilter(SimpleListFilter):

diff --git a/edc_qareports/auth_objects.py b/edc_qareports/auth_objects.py
@@ -15,14 +15,3 @@
     "edc_qareports.view_qareportlog",
     "edc_qareports.view_qareportlogsummary",
 ]
-
-
-# custom_codenames = [
-#     "edc_qareports.nav_qareports_section",
-# ]
-#
-# qa_reports_codenames.extend(custom_codenames)
-#
-# custom_codename_tuples = []
-# for codename in custom_codenames:
-#     custom_codename_tuples.append((codename, f"Can access {codename.split('.')[1]}"))
diff --git a/edc_qareports/auths.py b/edc_qareports/auths.py
@@ -9,11 +9,6 @@
     qa_reports_codenames,
 )
 
-# site_auths.add_custom_permissions_tuples(
-#     model="edc_qareports.edcpermissions", codename_tuples=custom_codename_tuples
-# )
-
-
 # groups
 site_auths.add_group(*qa_reports_codenames, name=QA_REPORTS)
 site_auths.add_group(*qa_reports_codenames, name=QA_REPORTS_AUDIT, view_only=True)

diff --git a/edc_qareports/tests/test_settings.py b/edc_qareports/tests/test_settings.py
@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+import sys
+from pathlib import Path
+
+from edc_test_settings.default_test_settings import DefaultTestSettings
+
+app_name = "edc_qareports"
+base_dir = Path(__file__).absolute().parent.parent.parent
+
+project_settings = DefaultTestSettings(
+    calling_file=__file__,
+    BASE_DIR=base_dir,
+    APP_NAME=app_name,
+    SUBJECT_VISIT_MODEL="edc_visit_tracking.subjectvisit",
+    SILENCED_SYSTEM_CHECKS=[
+        "sites.E101",
+        "edc_navbar.E002",
+        "edc_navbar.E003",
+        "edc_consent.E001",
+    ],
+    EDC_AUTH_SKIP_AUTH_UPDATER=True,
+    EDC_SITES_REGISTER_DEFAULT=True,
+    INSTALLED_APPS=[
+        "django.contrib.admin",
+        "django.contrib.auth",
+        "django.contrib.contenttypes",
+        "django.contrib.sessions",
+        "django.contrib.messages",
+        "django.contrib.staticfiles",
+        "django.contrib.sites",
+        "django_crypto_fields.apps.AppConfig",
+        "multisite",
+        "django_db_views",
+        # "edc_action_item.apps.AppConfig",
+        # "edc_adverse_event.apps.AppConfig",
+        # "edc_appointment.apps.AppConfig",
+        "edc_auth.apps.AppConfig",
+        # "edc_dashboard.apps.AppConfig",
+        # "edc_data_manager.apps.AppConfig",
+        # "edc_form_runners.apps.AppConfig",
+        "edc_lab.apps.AppConfig",
+        # "edc_metadata.apps.AppConfig",
+        "edc_notification.apps.AppConfig",
+        "edc_registration.apps.AppConfig",
+        "edc_sites.apps.AppConfig",
+        # "edc_subject_dashboard.apps.AppConfig",
+        # "edc_visit_tracking.apps.AppConfig",
+        # "edc_visit_schedule.apps.AppConfig",
+        "edc_qareports.apps.AppConfig",
+        "edc_appconfig.apps.AppConfig",
+    ],
+    EDC_SITES_CREATE_DEFAULT=False,
+    add_dashboard_middleware=False,
+    add_lab_dashboard_middleware=False,
+    add_adverse_event_dashboard_middleware=False,
+).settings
+
+
+for k, v in project_settings.items():
+    setattr(sys.modules[__name__], k, v)
diff --git a/runtests.py b/runtests.py
@@ -1,64 +1,5 @@
 #!/usr/bin/env python
-import logging
-from pathlib import Path
-
-from edc_test_settings.default_test_settings import DefaultTestSettings
-from edc_test_settings.func_main import func_main
-
-app_name = "edc_qareports"
-base_dir = Path(__file__).absolute().parent
-
-project_settings = DefaultTestSettings(
-    calling_file=__file__,
-    BASE_DIR=base_dir,
-    APP_NAME=app_name,
-    SUBJECT_VISIT_MODEL="edc_visit_tracking.subjectvisit",
-    SILENCED_SYSTEM_CHECKS=[
-        "sites.E101",
-        "edc_navbar.E002",
-        "edc_navbar.E003",
-        "edc_consent.E001",
-    ],
-    EDC_AUTH_SKIP_AUTH_UPDATER=True,
-    EDC_SITES_REGISTER_DEFAULT=True,
-    INSTALLED_APPS=[
-        "django.contrib.admin",
-        "django.contrib.auth",
-        "django.contrib.contenttypes",
-        "django.contrib.sessions",
-        "django.contrib.messages",
-        "django.contrib.staticfiles",
-        "django.contrib.sites",
-        "django_crypto_fields.apps.AppConfig",
-        "multisite",
-        "django_db_views",
-        "edc_action_item.apps.AppConfig",
-        "edc_appointment.apps.AppConfig",
-        "edc_auth.apps.AppConfig",
-        "edc_dashboard.apps.AppConfig",
-        "edc_data_manager.apps.AppConfig",
-        "edc_form_runners.apps.AppConfig",
-        "edc_lab.apps.AppConfig",
-        "edc_metadata.apps.AppConfig",
-        "edc_notification.apps.AppConfig",
-        "edc_registration.apps.AppConfig",
-        "edc_sites.apps.AppConfig",
-        "edc_subject_dashboard.apps.AppConfig",
-        "edc_visit_tracking.apps.AppConfig",
-        "edc_visit_schedule.apps.AppConfig",
-        "edc_qareports.apps.AppConfig",
-        "edc_appconfig.apps.AppConfig",
-    ],
-    add_dashboard_middleware=True,
-    add_lab_dashboard_middleware=False,
-    add_adverse_event_dashboard_middleware=False,
-).settings
-
-
-def main():
-    func_main(project_settings, f"{app_name}.tests")
-
+from edc_test_settings.func_main import func_main2
 
 if __name__ == "__main__":
-    logging.basicConfig()
-    main()
+    func_main2("edc_qareports.tests.test_settings", "edc_qareports.tests")