diff --git a/backend/tests/test_admin/test_django_admin_site.py b/backend/tests/test_admin/test_django_admin_site.py index c905638a18..d7b26696a6 100644 --- a/backend/tests/test_admin/test_django_admin_site.py +++ b/backend/tests/test_admin/test_django_admin_site.py @@ -22,7 +22,7 @@ from tests import factories from tests.helpers import ResponseMock, patch_method -from tests.test_external_services.test_verkkokauppa.test_merchant_requests import get_merchant_response +from tests.test_integrations.test_verkkokauppa.test_merchant_requests import get_merchant_response if TYPE_CHECKING: from django.urls import URLPattern diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_webhooks/__init__.py b/backend/tests/test_external_services/test_verkkokauppa/test_webhooks/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/backend/tests/test_external_services/__init__.py b/backend/tests/test_integrations/test_hauki/__init__.py similarity index 100% rename from backend/tests/test_external_services/__init__.py rename to backend/tests/test_integrations/test_hauki/__init__.py diff --git a/backend/tests/test_external_services/test_hauki/conftest.py b/backend/tests/test_integrations/test_hauki/conftest.py similarity index 84% rename from backend/tests/test_external_services/test_hauki/conftest.py rename to backend/tests/test_integrations/test_hauki/conftest.py index 2d816f62fa..bec510224d 100644 --- a/backend/tests/test_external_services/test_hauki/conftest.py +++ b/backend/tests/test_integrations/test_hauki/conftest.py @@ -1,11 +1,11 @@ from __future__ import annotations from typing import TYPE_CHECKING -from unittest import mock import pytest from tests.factories import OriginHaukiResourceFactory, ReservationUnitFactory +from tests.helpers import patch_method if TYPE_CHECKING: from tilavarauspalvelu.models import ReservationUnit @@ -16,9 +16,8 @@ def _force_HaukiAPIClient_to_be_mocked(): """Force 'HaukiAPIClient.generic' to be mocked in all tests.""" from tilavarauspalvelu.integrations.opening_hours.hauki_api_client import HaukiAPIClient - path = HaukiAPIClient.request.__module__ + "." + HaukiAPIClient.request.__qualname__ exception = NotImplementedError("'HaukiAPIClient.request' must be mocked!") - with mock.patch(path, side_effect=exception): + with patch_method(HaukiAPIClient.request, side_effect=exception): yield diff --git a/backend/tests/test_external_services/test_hauki/test_hauki_link_generator.py b/backend/tests/test_integrations/test_hauki/test_hauki_link_generator.py similarity index 100% rename from backend/tests/test_external_services/test_hauki/test_hauki_link_generator.py rename to backend/tests/test_integrations/test_hauki/test_hauki_link_generator.py diff --git a/backend/tests/test_external_services/test_hauki/test_hauki_resource_hash_updater.py b/backend/tests/test_integrations/test_hauki/test_hauki_resource_hash_updater.py similarity index 100% rename from backend/tests/test_external_services/test_hauki/test_hauki_resource_hash_updater.py rename to backend/tests/test_integrations/test_hauki/test_hauki_resource_hash_updater.py diff --git a/backend/tests/test_external_services/test_hauki/test_merge_overlapping_time_span_elements.py b/backend/tests/test_integrations/test_hauki/test_merge_overlapping_time_span_elements.py similarity index 99% rename from backend/tests/test_external_services/test_hauki/test_merge_overlapping_time_span_elements.py rename to backend/tests/test_integrations/test_hauki/test_merge_overlapping_time_span_elements.py index f66a10de4d..ecac0c16ae 100644 --- a/backend/tests/test_external_services/test_hauki/test_merge_overlapping_time_span_elements.py +++ b/backend/tests/test_integrations/test_hauki/test_merge_overlapping_time_span_elements.py @@ -5,7 +5,7 @@ from tilavarauspalvelu.integrations.opening_hours.time_span_element import TimeSpanElement from tilavarauspalvelu.integrations.opening_hours.time_span_element_utils import merge_overlapping_time_span_elements -from tests.test_external_services.test_hauki.test_reservable_time_spans_client import _get_date +from tests.test_integrations.test_hauki.test_reservable_time_spans_client import _get_date # No buffers diff --git a/backend/tests/test_external_services/test_hauki/test_override_reservable_with_closed_time_spans.py b/backend/tests/test_integrations/test_hauki/test_override_reservable_with_closed_time_spans.py similarity index 98% rename from backend/tests/test_external_services/test_hauki/test_override_reservable_with_closed_time_spans.py rename to backend/tests/test_integrations/test_hauki/test_override_reservable_with_closed_time_spans.py index 378ef38ac7..5657dc34be 100644 --- a/backend/tests/test_external_services/test_hauki/test_override_reservable_with_closed_time_spans.py +++ b/backend/tests/test_integrations/test_hauki/test_override_reservable_with_closed_time_spans.py @@ -5,7 +5,7 @@ override_reservable_with_closed_time_spans, ) -from tests.test_external_services.test_hauki.test_reservable_time_spans_client import ( +from tests.test_integrations.test_hauki.test_reservable_time_spans_client import ( _get_date, _get_normalised_time_spans, _get_reservable_and_closed_time_spans, diff --git a/backend/tests/test_external_services/test_hauki/test_reservable_time_spans_client.py b/backend/tests/test_integrations/test_hauki/test_reservable_time_spans_client.py similarity index 100% rename from backend/tests/test_external_services/test_hauki/test_reservable_time_spans_client.py rename to backend/tests/test_integrations/test_hauki/test_reservable_time_spans_client.py diff --git a/backend/tests/test_external_services/test_hauki/test_summaries.py b/backend/tests/test_integrations/test_hauki/test_summaries.py similarity index 100% rename from backend/tests/test_external_services/test_hauki/test_summaries.py rename to backend/tests/test_integrations/test_hauki/test_summaries.py diff --git a/backend/tests/test_external_services/test_hauki/test_time_span_element.py b/backend/tests/test_integrations/test_hauki/test_time_span_element.py similarity index 97% rename from backend/tests/test_external_services/test_hauki/test_time_span_element.py rename to backend/tests/test_integrations/test_hauki/test_time_span_element.py index ec8389bb57..60b8faefee 100644 --- a/backend/tests/test_external_services/test_hauki/test_time_span_element.py +++ b/backend/tests/test_integrations/test_hauki/test_time_span_element.py @@ -11,7 +11,7 @@ from tilavarauspalvelu.integrations.opening_hours.time_span_element import TimeSpanElement from utils.date_utils import DEFAULT_TIMEZONE -from tests.test_external_services.test_hauki.test_reservable_time_spans_client import _get_date +from tests.test_integrations.test_hauki.test_reservable_time_spans_client import _get_date class TimeSpanElementParams(NamedTuple): diff --git a/backend/tests/test_external_services/test_hauki/__init__.py b/backend/tests/test_integrations/test_tprek/__init__.py similarity index 100% rename from backend/tests/test_external_services/test_hauki/__init__.py rename to backend/tests/test_integrations/test_tprek/__init__.py diff --git a/backend/tests/test_external_services/test_tprek/helpers.py b/backend/tests/test_integrations/test_tprek/helpers.py similarity index 100% rename from backend/tests/test_external_services/test_tprek/helpers.py rename to backend/tests/test_integrations/test_tprek/helpers.py diff --git a/backend/tests/test_external_services/test_tprek/test_tprek_api_client.py b/backend/tests/test_integrations/test_tprek/test_tprek_api_client.py similarity index 96% rename from backend/tests/test_external_services/test_tprek/test_tprek_api_client.py rename to backend/tests/test_integrations/test_tprek/test_tprek_api_client.py index 72e01dcdd2..a8f6d2b81b 100644 --- a/backend/tests/test_external_services/test_tprek/test_tprek_api_client.py +++ b/backend/tests/test_integrations/test_tprek/test_tprek_api_client.py @@ -4,7 +4,7 @@ from utils.date_utils import local_datetime from tests.helpers import ResponseMock, patch_method -from tests.test_external_services.test_tprek.helpers import SINGLE_TPREK_UNIT_JSON +from tests.test_integrations.test_tprek.helpers import SINGLE_TPREK_UNIT_JSON @patch_method( diff --git a/backend/tests/test_external_services/test_tprek/test_tprek_unit_hauki_resource_importer.py b/backend/tests/test_integrations/test_tprek/test_tprek_unit_hauki_resource_importer.py similarity index 100% rename from backend/tests/test_external_services/test_tprek/test_tprek_unit_hauki_resource_importer.py rename to backend/tests/test_integrations/test_tprek/test_tprek_unit_hauki_resource_importer.py diff --git a/backend/tests/test_external_services/test_tprek/test_tprek_unit_importer.py b/backend/tests/test_integrations/test_tprek/test_tprek_unit_importer.py similarity index 98% rename from backend/tests/test_external_services/test_tprek/test_tprek_unit_importer.py rename to backend/tests/test_integrations/test_tprek/test_tprek_unit_importer.py index f5a55238ac..5e66c3b12d 100644 --- a/backend/tests/test_external_services/test_tprek/test_tprek_unit_importer.py +++ b/backend/tests/test_integrations/test_tprek/test_tprek_unit_importer.py @@ -14,7 +14,7 @@ from tests.factories import UnitFactory from tests.helpers import ResponseMock, patch_method -from tests.test_external_services.test_tprek.helpers import SINGLE_TPREK_UNIT_JSON +from tests.test_integrations.test_tprek.helpers import SINGLE_TPREK_UNIT_JSON # Applied to all tests pytestmark = [ diff --git a/backend/tests/test_external_services/test_tprek/__init__.py b/backend/tests/test_integrations/test_verkkokauppa/__init__.py similarity index 100% rename from backend/tests/test_external_services/test_tprek/__init__.py rename to backend/tests/test_integrations/test_verkkokauppa/__init__.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_create_order_params.py b/backend/tests/test_integrations/test_verkkokauppa/test_create_order_params.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_create_order_params.py rename to backend/tests/test_integrations/test_verkkokauppa/test_create_order_params.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_helpers.py b/backend/tests/test_integrations/test_verkkokauppa/test_helpers.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_helpers.py rename to backend/tests/test_integrations/test_verkkokauppa/test_helpers.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_merchant_requests.py b/backend/tests/test_integrations/test_verkkokauppa/test_merchant_requests.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_merchant_requests.py rename to backend/tests/test_integrations/test_verkkokauppa/test_merchant_requests.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_merchant_types.py b/backend/tests/test_integrations/test_verkkokauppa/test_merchant_types.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_merchant_types.py rename to backend/tests/test_integrations/test_verkkokauppa/test_merchant_types.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_order_from_json.py b/backend/tests/test_integrations/test_verkkokauppa/test_order_from_json.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_order_from_json.py rename to backend/tests/test_integrations/test_verkkokauppa/test_order_from_json.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_order_requests.py b/backend/tests/test_integrations/test_verkkokauppa/test_order_requests.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_order_requests.py rename to backend/tests/test_integrations/test_verkkokauppa/test_order_requests.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_order_types.py b/backend/tests/test_integrations/test_verkkokauppa/test_order_types.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_order_types.py rename to backend/tests/test_integrations/test_verkkokauppa/test_order_types.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_payment_requests.py b/backend/tests/test_integrations/test_verkkokauppa/test_payment_requests.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_payment_requests.py rename to backend/tests/test_integrations/test_verkkokauppa/test_payment_requests.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_payment_types.py b/backend/tests/test_integrations/test_verkkokauppa/test_payment_types.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_payment_types.py rename to backend/tests/test_integrations/test_verkkokauppa/test_payment_types.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_product_requests.py b/backend/tests/test_integrations/test_verkkokauppa/test_product_requests.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_product_requests.py rename to backend/tests/test_integrations/test_verkkokauppa/test_product_requests.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_product_types.py b/backend/tests/test_integrations/test_verkkokauppa/test_product_types.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_product_types.py rename to backend/tests/test_integrations/test_verkkokauppa/test_product_types.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_pruning.py b/backend/tests/test_integrations/test_verkkokauppa/test_pruning.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_pruning.py rename to backend/tests/test_integrations/test_verkkokauppa/test_pruning.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_refund_from_json.py b/backend/tests/test_integrations/test_verkkokauppa/test_refund_from_json.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_refund_from_json.py rename to backend/tests/test_integrations/test_verkkokauppa/test_refund_from_json.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_refund_status_from_json.py b/backend/tests/test_integrations/test_verkkokauppa/test_refund_status_from_json.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_refund_status_from_json.py rename to backend/tests/test_integrations/test_verkkokauppa/test_refund_status_from_json.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_task_refresh_reservation_unit_accounting.py b/backend/tests/test_integrations/test_verkkokauppa/test_task_refresh_reservation_unit_accounting.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_task_refresh_reservation_unit_accounting.py rename to backend/tests/test_integrations/test_verkkokauppa/test_task_refresh_reservation_unit_accounting.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_task_refresh_reservation_unit_product_mapping.py b/backend/tests/test_integrations/test_verkkokauppa/test_task_refresh_reservation_unit_product_mapping.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_task_refresh_reservation_unit_product_mapping.py rename to backend/tests/test_integrations/test_verkkokauppa/test_task_refresh_reservation_unit_product_mapping.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_tasks.py b/backend/tests/test_integrations/test_verkkokauppa/test_tasks.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_tasks.py rename to backend/tests/test_integrations/test_verkkokauppa/test_tasks.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_validators.py b/backend/tests/test_integrations/test_verkkokauppa/test_validators.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_validators.py rename to backend/tests/test_integrations/test_verkkokauppa/test_validators.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/__init__.py b/backend/tests/test_integrations/test_verkkokauppa/test_webhooks/__init__.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/__init__.py rename to backend/tests/test_integrations/test_verkkokauppa/test_webhooks/__init__.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_webhooks/helpers.py b/backend/tests/test_integrations/test_verkkokauppa/test_webhooks/helpers.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_webhooks/helpers.py rename to backend/tests/test_integrations/test_verkkokauppa/test_webhooks/helpers.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_webhooks/test_order_cancel_webhooks.py b/backend/tests/test_integrations/test_verkkokauppa/test_webhooks/test_order_cancel_webhooks.py similarity index 100% rename from backend/tests/test_external_services/test_verkkokauppa/test_webhooks/test_order_cancel_webhooks.py rename to backend/tests/test_integrations/test_verkkokauppa/test_webhooks/test_order_cancel_webhooks.py diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_webhooks/test_order_payment_webhooks.py b/backend/tests/test_integrations/test_verkkokauppa/test_webhooks/test_order_payment_webhooks.py similarity index 98% rename from backend/tests/test_external_services/test_verkkokauppa/test_webhooks/test_order_payment_webhooks.py rename to backend/tests/test_integrations/test_verkkokauppa/test_webhooks/test_order_payment_webhooks.py index bb07f081bf..362d67ccc6 100644 --- a/backend/tests/test_external_services/test_verkkokauppa/test_webhooks/test_order_payment_webhooks.py +++ b/backend/tests/test_integrations/test_verkkokauppa/test_webhooks/test_order_payment_webhooks.py @@ -13,7 +13,7 @@ from tests.factories import PaymentOrderFactory, ReservationFactory from tests.helpers import patch_method -from tests.test_external_services.test_verkkokauppa.test_webhooks.helpers import get_mock_order_payment_api +from tests.test_integrations.test_verkkokauppa.test_webhooks.helpers import get_mock_order_payment_api # Applied to all tests pytestmark = [ diff --git a/backend/tests/test_external_services/test_verkkokauppa/test_webhooks/test_order_refund_webhooks.py b/backend/tests/test_integrations/test_verkkokauppa/test_webhooks/test_order_refund_webhooks.py similarity index 98% rename from backend/tests/test_external_services/test_verkkokauppa/test_webhooks/test_order_refund_webhooks.py rename to backend/tests/test_integrations/test_verkkokauppa/test_webhooks/test_order_refund_webhooks.py index 0625606134..d9f92a53c5 100644 --- a/backend/tests/test_external_services/test_verkkokauppa/test_webhooks/test_order_refund_webhooks.py +++ b/backend/tests/test_integrations/test_verkkokauppa/test_webhooks/test_order_refund_webhooks.py @@ -12,7 +12,7 @@ from tests.factories import PaymentOrderFactory from tests.helpers import patch_method -from tests.test_external_services.test_verkkokauppa.test_webhooks.helpers import get_mock_order_refund_api +from tests.test_integrations.test_verkkokauppa.test_webhooks.helpers import get_mock_order_refund_api # Applied to all tests pytestmark = [