Skip to content

Commit 0a9658d

Browse files
erikvwerikvw
committed
Merge branch 'release/0.3.51' into main
2 parents 370c6a2 + 392b992 commit 0a9658d

File tree

3 files changed

+68
-72
lines changed

3 files changed

+68
-72
lines changed

‎edc_export/tests/test_settings.py

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
#!/usr/bin/env python
2+
import sys
3+
from pathlib import Path
4+
5+
from edc_test_settings.default_test_settings import DefaultTestSettings
6+
7+
app_name = "edc_export"
8+
base_dir = Path(__file__).absolute().parent.parent.parent
9+
10+
project_settings = DefaultTestSettings(
11+
calling_file=__file__,
12+
APP_NAME=app_name,
13+
BASE_DIR=base_dir,
14+
ETC_DIR=str(base_dir / app_name / "tests" / "etc"),
15+
SILENCED_SYSTEM_CHECKS=["sites.E101", "edc_navbar.E002", "edc_navbar.E003"],
16+
EDC_BOOTSTRAP=3,
17+
EDC_SITES_REGISTER_DEFAULT=True,
18+
SUBJECT_SCREENING_MODEL="export_app.subjectscreening",
19+
SUBJECT_CONSENT_MODEL="export_app.subjectconsent",
20+
SUBJECT_VISIT_MODEL="export_app.subjectvisit",
21+
SUBJECT_VISIT_MISSED_MODEL="export_app.subjectvisitmissed",
22+
SUBJECT_REQUISITION_MODEL="export_app.subjectrequisition",
23+
SUBJECT_REFUSAL_MODEL="export_app.subjectrefusal",
24+
SUBJECT_APP_LABEL="export_app",
25+
INSTALLED_APPS=[
26+
"django.contrib.admin",
27+
"django.contrib.auth",
28+
"django.contrib.contenttypes",
29+
"django.contrib.sessions",
30+
"django.contrib.messages",
31+
"django.contrib.staticfiles",
32+
"django.contrib.sites",
33+
"django_crypto_fields.apps.AppConfig",
34+
"django_revision.apps.AppConfig",
35+
"multisite",
36+
"edc_appointment.apps.AppConfig",
37+
"edc_action_item.apps.AppConfig",
38+
"edc_auth.apps.AppConfig",
39+
"edc_crf.apps.AppConfig",
40+
"edc_data_manager.apps.AppConfig",
41+
"edc_form_runners.apps.AppConfig",
42+
"edc_timepoint.apps.AppConfig",
43+
"edc_metadata.apps.AppConfig",
44+
"edc_notification.apps.AppConfig",
45+
"edc_identifier.apps.AppConfig",
46+
"edc_list_data.apps.AppConfig",
47+
"edc_device.apps.AppConfig",
48+
"edc_offstudy.apps.AppConfig",
49+
"edc_registration.apps.AppConfig",
50+
"edc_visit_schedule.apps.AppConfig",
51+
"edc_randomization.apps.AppConfig",
52+
"edc_lab.apps.AppConfig",
53+
"edc_sites.apps.AppConfig",
54+
"edc_visit_tracking.apps.AppConfig",
55+
"edc_facility.apps.AppConfig",
56+
"edc_export.apps.AppConfig",
57+
"export_app.apps.AppConfig",
58+
"edc_appconfig.apps.AppConfig",
59+
],
60+
add_dashboard_middleware=False,
61+
).settings
62+
63+
64+
for k, v in project_settings.items():
65+
setattr(sys.modules[__name__], k, v)

‎export_app/models.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,7 @@ class CrfWithInline(CrfModelMixin, BaseUuidModel):
193193

194194

195195
class OnScheduleOne(SiteModelMixin, OnScheduleModelMixin, BaseUuidModel):
196-
def put_on_schedule(self):
197-
pass
196+
pass
198197

199198

200199
class OffScheduleOne(SiteModelMixin, OffScheduleModelMixin, BaseUuidModel):

‎runtests.py

Lines changed: 2 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,5 @@
11
#!/usr/bin/env python
2-
import logging
3-
from pathlib import Path
4-
5-
from edc_test_utils import DefaultTestSettings, func_main
6-
7-
app_name = "edc_export"
8-
base_dir = Path(__file__).absolute().parent
9-
10-
project_settings = DefaultTestSettings(
11-
calling_file=__file__,
12-
APP_NAME=app_name,
13-
BASE_DIR=base_dir,
14-
ETC_DIR=str(base_dir / app_name / "tests" / "etc"),
15-
SILENCED_SYSTEM_CHECKS=["sites.E101", "edc_navbar.E002", "edc_navbar.E003"],
16-
EDC_BOOTSTRAP=3,
17-
EDC_SITES_REGISTER_DEFAULT=True,
18-
SUBJECT_SCREENING_MODEL="export_app.subjectscreening",
19-
SUBJECT_CONSENT_MODEL="export_app.subjectconsent",
20-
SUBJECT_VISIT_MODEL="export_app.subjectvisit",
21-
SUBJECT_VISIT_MISSED_MODEL="export_app.subjectvisitmissed",
22-
SUBJECT_REQUISITION_MODEL="export_app.subjectrequisition",
23-
SUBJECT_REFUSAL_MODEL="export_app.subjectrefusal",
24-
SUBJECT_APP_LABEL="export_app",
25-
INSTALLED_APPS=[
26-
"django.contrib.admin",
27-
"django.contrib.auth",
28-
"django.contrib.contenttypes",
29-
"django.contrib.sessions",
30-
"django.contrib.messages",
31-
"django.contrib.staticfiles",
32-
"django.contrib.sites",
33-
"django_crypto_fields.apps.AppConfig",
34-
"django_revision.apps.AppConfig",
35-
"multisite",
36-
"edc_appointment.apps.AppConfig",
37-
"edc_action_item.apps.AppConfig",
38-
"edc_auth.apps.AppConfig",
39-
"edc_crf.apps.AppConfig",
40-
"edc_data_manager.apps.AppConfig",
41-
"edc_form_runners.apps.AppConfig",
42-
"edc_timepoint.apps.AppConfig",
43-
"edc_protocol.apps.AppConfig",
44-
"edc_metadata.apps.AppConfig",
45-
"edc_notification.apps.AppConfig",
46-
"edc_identifier.apps.AppConfig",
47-
"edc_list_data.apps.AppConfig",
48-
"edc_device.apps.AppConfig",
49-
"edc_offstudy.apps.AppConfig",
50-
"edc_registration.apps.AppConfig",
51-
"edc_visit_schedule.apps.AppConfig",
52-
"edc_dashboard.apps.AppConfig",
53-
"edc_randomization.apps.AppConfig",
54-
"edc_subject_dashboard.apps.AppConfig",
55-
"edc_lab.apps.AppConfig",
56-
"edc_sites.apps.AppConfig",
57-
"edc_visit_tracking.apps.AppConfig",
58-
"edc_facility.apps.AppConfig",
59-
"edc_export.apps.AppConfig",
60-
"export_app.apps.AppConfig",
61-
"edc_appconfig.apps.AppConfig",
62-
],
63-
add_dashboard_middleware=True,
64-
).settings
65-
66-
67-
def main():
68-
func_main(project_settings, *[f"{app_name}.tests"])
69-
2+
from edc_test_settings.func_main import func_main2
703

714
if __name__ == "__main__":
72-
logging.basicConfig()
73-
main()
5+
func_main2("edc_export.tests.test_settings", "edc_export.tests")

0 commit comments

Comments
 (0)