From 6f627ef6c9fb383d80cbcf8aea584cb8ce0a6818 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 30 Dec 2020 12:09:34 +0100 Subject: [PATCH] Tests - minor refactor --- fittrackee/tests/activities/__init__.py | 0 fittrackee/tests/{ => activities}/test_activities_api_0_get.py | 0 fittrackee/tests/{ => activities}/test_activities_api_1_post.py | 0 .../tests/{ => activities}/test_activities_api_2_patch.py | 0 .../tests/{ => activities}/test_activities_api_3_delete.py | 0 fittrackee/tests/{ => activities}/test_activities_model.py | 0 fittrackee/tests/{ => activities}/test_records_api.py | 0 fittrackee/tests/{ => activities}/test_records_model.py | 0 fittrackee/tests/{ => activities}/test_sports_api.py | 0 fittrackee/tests/{ => activities}/test_sports_model.py | 0 fittrackee/tests/{ => activities}/test_stats_api.py | 0 fittrackee/tests/application/__init__.py | 0 fittrackee/tests/{ => application}/test_app_config_api.py | 0 fittrackee/tests/{ => application}/test_app_config_model.py | 0 fittrackee/tests/{ => application}/test_config.py | 0 fittrackee/tests/{ => application}/test_health_check_api.py | 0 fittrackee/tests/email/__init__.py | 0 fittrackee/tests/{ => email}/test_email.py | 2 +- .../tests/{ => email}/test_email_template_password_request.py | 2 +- fittrackee/tests/{ => email}/test_email_utils.py | 0 fittrackee/tests/users/__init__.py | 0 fittrackee/tests/{ => users}/test_auth_api.py | 0 fittrackee/tests/{ => users}/test_users_api.py | 0 fittrackee/tests/{ => users}/test_users_model.py | 0 24 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 fittrackee/tests/activities/__init__.py rename fittrackee/tests/{ => activities}/test_activities_api_0_get.py (100%) rename fittrackee/tests/{ => activities}/test_activities_api_1_post.py (100%) rename fittrackee/tests/{ => activities}/test_activities_api_2_patch.py (100%) rename fittrackee/tests/{ => activities}/test_activities_api_3_delete.py (100%) rename fittrackee/tests/{ => activities}/test_activities_model.py (100%) rename fittrackee/tests/{ => activities}/test_records_api.py (100%) rename fittrackee/tests/{ => activities}/test_records_model.py (100%) rename fittrackee/tests/{ => activities}/test_sports_api.py (100%) rename fittrackee/tests/{ => activities}/test_sports_model.py (100%) rename fittrackee/tests/{ => activities}/test_stats_api.py (100%) create mode 100644 fittrackee/tests/application/__init__.py rename fittrackee/tests/{ => application}/test_app_config_api.py (100%) rename fittrackee/tests/{ => application}/test_app_config_model.py (100%) rename fittrackee/tests/{ => application}/test_config.py (100%) rename fittrackee/tests/{ => application}/test_health_check_api.py (100%) create mode 100644 fittrackee/tests/email/__init__.py rename fittrackee/tests/{ => email}/test_email.py (97%) rename fittrackee/tests/{ => email}/test_email_template_password_request.py (97%) rename fittrackee/tests/{ => email}/test_email_utils.py (100%) create mode 100644 fittrackee/tests/users/__init__.py rename fittrackee/tests/{ => users}/test_auth_api.py (100%) rename fittrackee/tests/{ => users}/test_users_api.py (100%) rename fittrackee/tests/{ => users}/test_users_model.py (100%) diff --git a/fittrackee/tests/activities/__init__.py b/fittrackee/tests/activities/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/fittrackee/tests/test_activities_api_0_get.py b/fittrackee/tests/activities/test_activities_api_0_get.py similarity index 100% rename from fittrackee/tests/test_activities_api_0_get.py rename to fittrackee/tests/activities/test_activities_api_0_get.py diff --git a/fittrackee/tests/test_activities_api_1_post.py b/fittrackee/tests/activities/test_activities_api_1_post.py similarity index 100% rename from fittrackee/tests/test_activities_api_1_post.py rename to fittrackee/tests/activities/test_activities_api_1_post.py diff --git a/fittrackee/tests/test_activities_api_2_patch.py b/fittrackee/tests/activities/test_activities_api_2_patch.py similarity index 100% rename from fittrackee/tests/test_activities_api_2_patch.py rename to fittrackee/tests/activities/test_activities_api_2_patch.py diff --git a/fittrackee/tests/test_activities_api_3_delete.py b/fittrackee/tests/activities/test_activities_api_3_delete.py similarity index 100% rename from fittrackee/tests/test_activities_api_3_delete.py rename to fittrackee/tests/activities/test_activities_api_3_delete.py diff --git a/fittrackee/tests/test_activities_model.py b/fittrackee/tests/activities/test_activities_model.py similarity index 100% rename from fittrackee/tests/test_activities_model.py rename to fittrackee/tests/activities/test_activities_model.py diff --git a/fittrackee/tests/test_records_api.py b/fittrackee/tests/activities/test_records_api.py similarity index 100% rename from fittrackee/tests/test_records_api.py rename to fittrackee/tests/activities/test_records_api.py diff --git a/fittrackee/tests/test_records_model.py b/fittrackee/tests/activities/test_records_model.py similarity index 100% rename from fittrackee/tests/test_records_model.py rename to fittrackee/tests/activities/test_records_model.py diff --git a/fittrackee/tests/test_sports_api.py b/fittrackee/tests/activities/test_sports_api.py similarity index 100% rename from fittrackee/tests/test_sports_api.py rename to fittrackee/tests/activities/test_sports_api.py diff --git a/fittrackee/tests/test_sports_model.py b/fittrackee/tests/activities/test_sports_model.py similarity index 100% rename from fittrackee/tests/test_sports_model.py rename to fittrackee/tests/activities/test_sports_model.py diff --git a/fittrackee/tests/test_stats_api.py b/fittrackee/tests/activities/test_stats_api.py similarity index 100% rename from fittrackee/tests/test_stats_api.py rename to fittrackee/tests/activities/test_stats_api.py diff --git a/fittrackee/tests/application/__init__.py b/fittrackee/tests/application/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/fittrackee/tests/test_app_config_api.py b/fittrackee/tests/application/test_app_config_api.py similarity index 100% rename from fittrackee/tests/test_app_config_api.py rename to fittrackee/tests/application/test_app_config_api.py diff --git a/fittrackee/tests/test_app_config_model.py b/fittrackee/tests/application/test_app_config_model.py similarity index 100% rename from fittrackee/tests/test_app_config_model.py rename to fittrackee/tests/application/test_app_config_model.py diff --git a/fittrackee/tests/test_config.py b/fittrackee/tests/application/test_config.py similarity index 100% rename from fittrackee/tests/test_config.py rename to fittrackee/tests/application/test_config.py diff --git a/fittrackee/tests/test_health_check_api.py b/fittrackee/tests/application/test_health_check_api.py similarity index 100% rename from fittrackee/tests/test_health_check_api.py rename to fittrackee/tests/application/test_health_check_api.py diff --git a/fittrackee/tests/email/__init__.py b/fittrackee/tests/email/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/fittrackee/tests/test_email.py b/fittrackee/tests/email/test_email.py similarity index 97% rename from fittrackee/tests/test_email.py rename to fittrackee/tests/email/test_email.py index 408f3e5d..e451b55f 100644 --- a/fittrackee/tests/test_email.py +++ b/fittrackee/tests/email/test_email.py @@ -3,7 +3,7 @@ from unittest.mock import patch from fittrackee import email_service from fittrackee.email.email import EmailMessage -from .template_results.password_reset_request import expected_en_text_body +from ..template_results.password_reset_request import expected_en_text_body class TestEmailMessage: diff --git a/fittrackee/tests/test_email_template_password_request.py b/fittrackee/tests/email/test_email_template_password_request.py similarity index 97% rename from fittrackee/tests/test_email_template_password_request.py rename to fittrackee/tests/email/test_email_template_password_request.py index 6bb1a257..597dc6b9 100644 --- a/fittrackee/tests/test_email_template_password_request.py +++ b/fittrackee/tests/email/test_email_template_password_request.py @@ -1,7 +1,7 @@ import pytest from fittrackee.email.email import EmailTemplate -from .template_results.password_reset_request import ( +from ..template_results.password_reset_request import ( expected_en_html_body, expected_en_text_body, expected_fr_html_body, diff --git a/fittrackee/tests/test_email_utils.py b/fittrackee/tests/email/test_email_utils.py similarity index 100% rename from fittrackee/tests/test_email_utils.py rename to fittrackee/tests/email/test_email_utils.py diff --git a/fittrackee/tests/users/__init__.py b/fittrackee/tests/users/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/fittrackee/tests/test_auth_api.py b/fittrackee/tests/users/test_auth_api.py similarity index 100% rename from fittrackee/tests/test_auth_api.py rename to fittrackee/tests/users/test_auth_api.py diff --git a/fittrackee/tests/test_users_api.py b/fittrackee/tests/users/test_users_api.py similarity index 100% rename from fittrackee/tests/test_users_api.py rename to fittrackee/tests/users/test_users_api.py diff --git a/fittrackee/tests/test_users_model.py b/fittrackee/tests/users/test_users_model.py similarity index 100% rename from fittrackee/tests/test_users_model.py rename to fittrackee/tests/users/test_users_model.py