Move tests/test_external_services -> tests/test_integrations

City-of-Helsinki · Feb 17, 2025 · f056934 · f056934
1 parent 3a7e4f8
commit f056934
Show file tree

Hide file tree

Showing 40 changed files with 10 additions and 11 deletions.
diff --git 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
diff --git a/.../tests/test_external_services/__init__.py → .../test_integrations/test_hauki/__init__.py b/.../tests/test_external_services/__init__.py → .../test_integrations/test_hauki/__init__.py
diff --git a/..._external_services/test_hauki/conftest.py → .../test_integrations/test_hauki/conftest.py b/..._external_services/test_hauki/conftest.py → .../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/...s/test_hauki/test_hauki_link_generator.py → ...s/test_hauki/test_hauki_link_generator.py b/...s/test_hauki/test_hauki_link_generator.py → ...s/test_hauki/test_hauki_link_generator.py
diff --git a/...hauki/test_hauki_resource_hash_updater.py → ...hauki/test_hauki_resource_hash_updater.py b/...hauki/test_hauki_resource_hash_updater.py → ...hauki/test_hauki_resource_hash_updater.py
diff --git a/...t_merge_overlapping_time_span_elements.py → ...t_merge_overlapping_time_span_elements.py b/...t_merge_overlapping_time_span_elements.py → ...t_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/...ride_reservable_with_closed_time_spans.py → ...ride_reservable_with_closed_time_spans.py b/...ride_reservable_with_closed_time_spans.py → ...ride_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/...auki/test_reservable_time_spans_client.py → ...auki/test_reservable_time_spans_client.py b/...auki/test_reservable_time_spans_client.py → ...auki/test_reservable_time_spans_client.py
diff --git a/...nal_services/test_hauki/test_summaries.py → ...integrations/test_hauki/test_summaries.py b/...nal_services/test_hauki/test_summaries.py → ...integrations/test_hauki/test_summaries.py
diff --git a/...ices/test_hauki/test_time_span_element.py → ...ions/test_hauki/test_time_span_element.py b/...ices/test_hauki/test_time_span_element.py → ...ions/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/..._external_services/test_hauki/__init__.py → .../test_integrations/test_tprek/__init__.py b/..._external_services/test_hauki/__init__.py → .../test_integrations/test_tprek/__init__.py
diff --git a/...t_external_services/test_tprek/helpers.py → ...s/test_integrations/test_tprek/helpers.py b/...t_external_services/test_tprek/helpers.py → ...s/test_integrations/test_tprek/helpers.py
diff --git a/...vices/test_tprek/test_tprek_api_client.py → ...tions/test_tprek/test_tprek_api_client.py b/...vices/test_tprek/test_tprek_api_client.py → ...tions/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/...est_tprek_unit_hauki_resource_importer.py → ...est_tprek_unit_hauki_resource_importer.py b/...est_tprek_unit_hauki_resource_importer.py → ...est_tprek_unit_hauki_resource_importer.py
diff --git a/...es/test_tprek/test_tprek_unit_importer.py → ...ns/test_tprek/test_tprek_unit_importer.py b/...es/test_tprek/test_tprek_unit_importer.py → ...ns/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/..._external_services/test_tprek/__init__.py → ...ntegrations/test_verkkokauppa/__init__.py b/..._external_services/test_tprek/__init__.py → ...ntegrations/test_verkkokauppa/__init__.py
diff --git a/..._verkkokauppa/test_create_order_params.py → ..._verkkokauppa/test_create_order_params.py b/..._verkkokauppa/test_create_order_params.py → ..._verkkokauppa/test_create_order_params.py
diff --git a/...ervices/test_verkkokauppa/test_helpers.py → ...rations/test_verkkokauppa/test_helpers.py b/...ervices/test_verkkokauppa/test_helpers.py → ...rations/test_verkkokauppa/test_helpers.py
diff --git a/...st_verkkokauppa/test_merchant_requests.py → ...st_verkkokauppa/test_merchant_requests.py b/...st_verkkokauppa/test_merchant_requests.py → ...st_verkkokauppa/test_merchant_requests.py
diff --git a/.../test_verkkokauppa/test_merchant_types.py → .../test_verkkokauppa/test_merchant_types.py b/.../test_verkkokauppa/test_merchant_types.py → .../test_verkkokauppa/test_merchant_types.py
diff --git a/...test_verkkokauppa/test_order_from_json.py → ...test_verkkokauppa/test_order_from_json.py b/...test_verkkokauppa/test_order_from_json.py → ...test_verkkokauppa/test_order_from_json.py
diff --git a/.../test_verkkokauppa/test_order_requests.py → .../test_verkkokauppa/test_order_requests.py b/.../test_verkkokauppa/test_order_requests.py → .../test_verkkokauppa/test_order_requests.py
diff --git a/...ces/test_verkkokauppa/test_order_types.py → ...ons/test_verkkokauppa/test_order_types.py b/...ces/test_verkkokauppa/test_order_types.py → ...ons/test_verkkokauppa/test_order_types.py
diff --git a/...est_verkkokauppa/test_payment_requests.py → ...est_verkkokauppa/test_payment_requests.py b/...est_verkkokauppa/test_payment_requests.py → ...est_verkkokauppa/test_payment_requests.py
diff --git a/...s/test_verkkokauppa/test_payment_types.py → ...s/test_verkkokauppa/test_payment_types.py b/...s/test_verkkokauppa/test_payment_types.py → ...s/test_verkkokauppa/test_payment_types.py
diff --git a/...est_verkkokauppa/test_product_requests.py → ...est_verkkokauppa/test_product_requests.py b/...est_verkkokauppa/test_product_requests.py → ...est_verkkokauppa/test_product_requests.py
diff --git a/...s/test_verkkokauppa/test_product_types.py → ...s/test_verkkokauppa/test_product_types.py b/...s/test_verkkokauppa/test_product_types.py → ...s/test_verkkokauppa/test_product_types.py
diff --git a/...ervices/test_verkkokauppa/test_pruning.py → ...rations/test_verkkokauppa/test_pruning.py b/...ervices/test_verkkokauppa/test_pruning.py → ...rations/test_verkkokauppa/test_pruning.py
diff --git a/...est_verkkokauppa/test_refund_from_json.py → ...est_verkkokauppa/test_refund_from_json.py b/...est_verkkokauppa/test_refund_from_json.py → ...est_verkkokauppa/test_refund_from_json.py
diff --git a/...kkokauppa/test_refund_status_from_json.py → ...kkokauppa/test_refund_status_from_json.py b/...kkokauppa/test_refund_status_from_json.py → ...kkokauppa/test_refund_status_from_json.py
diff --git a/...sk_refresh_reservation_unit_accounting.py → ...sk_refresh_reservation_unit_accounting.py b/...sk_refresh_reservation_unit_accounting.py → ...sk_refresh_reservation_unit_accounting.py
diff --git a/...fresh_reservation_unit_product_mapping.py → ...fresh_reservation_unit_product_mapping.py b/...fresh_reservation_unit_product_mapping.py → ...fresh_reservation_unit_product_mapping.py
diff --git a/..._services/test_verkkokauppa/test_tasks.py → ...egrations/test_verkkokauppa/test_tasks.py b/..._services/test_verkkokauppa/test_tasks.py → ...egrations/test_verkkokauppa/test_tasks.py
diff --git a/...ices/test_verkkokauppa/test_validators.py → ...ions/test_verkkokauppa/test_validators.py b/...ices/test_verkkokauppa/test_validators.py → ...ions/test_verkkokauppa/test_validators.py
diff --git a/...al_services/test_verkkokauppa/__init__.py → ...st_verkkokauppa/test_webhooks/__init__.py b/...al_services/test_verkkokauppa/__init__.py → ...st_verkkokauppa/test_webhooks/__init__.py
diff --git a/...est_verkkokauppa/test_webhooks/helpers.py → ...est_verkkokauppa/test_webhooks/helpers.py b/...est_verkkokauppa/test_webhooks/helpers.py → ...est_verkkokauppa/test_webhooks/helpers.py
diff --git a/...st_webhooks/test_order_cancel_webhooks.py → ...st_webhooks/test_order_cancel_webhooks.py b/...st_webhooks/test_order_cancel_webhooks.py → ...st_webhooks/test_order_cancel_webhooks.py
diff --git a/...t_webhooks/test_order_payment_webhooks.py → ...t_webhooks/test_order_payment_webhooks.py b/...t_webhooks/test_order_payment_webhooks.py → ...t_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/...st_webhooks/test_order_refund_webhooks.py → ...st_webhooks/test_order_refund_webhooks.py b/...st_webhooks/test_order_refund_webhooks.py → ...st_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 = [