From 3f4856efa2e9420efd0e2d551ee1257b416d0a7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Mon, 16 Nov 2026 13:02:15 +0100 Subject: [PATCH] test(tests): move Laravel-bound tests out of Unit and group Unit Cqs tests (lot 3B) --- .../Http/Middleware/EnsureCustomerEmailIsVerifiedTest.php | 5 ++--- tests/{Unit => Integration/WithApp}/App/Dto/PageDtoTest.php | 2 ++ .../Infra/Adapters/Services/AppAdminAuthServiceTest.php | 2 ++ .../Infra/Adapters/Services/AppCustomerAuthServiceTest.php | 5 +---- .../Actions/Common/ChangeModelOrderPositionInputTest.php | 0 .../{ => Cqs}/Actions/Common/ExecuteMassActionInputTest.php | 0 .../Actions/Customers/RegisterCustomerInputTest.php | 0 .../{ => Cqs}/Actions/Discounts/CreateDiscountInputTest.php | 0 .../{ => Cqs}/Actions/Discounts/UpdateDiscountInputTest.php | 0 tests/Unit/App/{ => Cqs}/Actions/Faqs/CreateFaqInputTest.php | 0 tests/Unit/App/{ => Cqs}/Actions/Faqs/UpdateFaqInputTest.php | 0 .../App/{ => Cqs}/Actions/Orders/ApplyPickTimeSlotTest.php | 0 tests/Unit/App/{ => Cqs}/Actions/Orders/CancelOrderTest.php | 0 .../{ => Cqs}/Actions/Orders/InitializeOrderTunnelTest.php | 0 .../App/{ => Cqs}/Actions/Orders/PlacePendingOrderTest.php | 0 .../Unit/App/{ => Cqs}/Actions/Pages/UpdatePageInputTest.php | 0 .../PickupExceptions/CreatePickupExceptionInputTest.php | 0 .../PickupExceptions/UpdatePickupExceptionInputTest.php | 0 .../Actions/ProductIncos/AssociateProductIncoInputTest.php | 0 .../{ => Cqs}/Actions/Settings/UpdateSettingsInputTest.php | 0 .../Unit/App/{ => Cqs}/Actions/Shops/CreateShopInputTest.php | 0 .../Unit/App/{ => Cqs}/Actions/Shops/UpdateShopInputTest.php | 0 .../Actions/Shops/UpdateShopPickupExceptionsInputTest.php | 0 .../App/{ => Cqs}/Actions/Slides/UpdateSlideInputTest.php | 0 tests/Unit/App/{ => Cqs}/Actions/Tags/CreateTagInputTest.php | 0 tests/Unit/App/{ => Cqs}/Actions/Tags/UpdateTagInputTest.php | 0 .../{ => Cqs}/Queries/Orders/GetBasketSummaryQueryTest.php | 0 .../Queries/Orders/GetOrderConfirmationQueryTest.php | 0 .../{ => Cqs}/Queries/Orders/GetPickTimeSlotQueryTest.php | 0 .../Queries/ProductIncos/GetArcadiaIncoPreviewQueryTest.php | 0 30 files changed, 7 insertions(+), 7 deletions(-) rename tests/{Unit => Feature}/App/Http/Middleware/EnsureCustomerEmailIsVerifiedTest.php (98%) rename tests/{Unit => Integration/WithApp}/App/Dto/PageDtoTest.php (97%) rename tests/{Unit => Integration/WithApp}/Infra/Adapters/Services/AppAdminAuthServiceTest.php (98%) rename tests/{Unit => Integration/WithApp}/Infra/Adapters/Services/AppCustomerAuthServiceTest.php (98%) rename tests/Unit/App/{ => Cqs}/Actions/Common/ChangeModelOrderPositionInputTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/Common/ExecuteMassActionInputTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/Customers/RegisterCustomerInputTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/Discounts/CreateDiscountInputTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/Discounts/UpdateDiscountInputTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/Faqs/CreateFaqInputTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/Faqs/UpdateFaqInputTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/Orders/ApplyPickTimeSlotTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/Orders/CancelOrderTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/Orders/InitializeOrderTunnelTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/Orders/PlacePendingOrderTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/Pages/UpdatePageInputTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/PickupExceptions/CreatePickupExceptionInputTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/PickupExceptions/UpdatePickupExceptionInputTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/ProductIncos/AssociateProductIncoInputTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/Settings/UpdateSettingsInputTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/Shops/CreateShopInputTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/Shops/UpdateShopInputTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/Shops/UpdateShopPickupExceptionsInputTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/Slides/UpdateSlideInputTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/Tags/CreateTagInputTest.php (100%) rename tests/Unit/App/{ => Cqs}/Actions/Tags/UpdateTagInputTest.php (100%) rename tests/Unit/App/{ => Cqs}/Queries/Orders/GetBasketSummaryQueryTest.php (100%) rename tests/Unit/App/{ => Cqs}/Queries/Orders/GetOrderConfirmationQueryTest.php (100%) rename tests/Unit/App/{ => Cqs}/Queries/Orders/GetPickTimeSlotQueryTest.php (100%) rename tests/Unit/App/{ => Cqs}/Queries/ProductIncos/GetArcadiaIncoPreviewQueryTest.php (100%) diff --git a/tests/Unit/App/Http/Middleware/EnsureCustomerEmailIsVerifiedTest.php b/tests/Feature/App/Http/Middleware/EnsureCustomerEmailIsVerifiedTest.php similarity index 98% rename from tests/Unit/App/Http/Middleware/EnsureCustomerEmailIsVerifiedTest.php rename to tests/Feature/App/Http/Middleware/EnsureCustomerEmailIsVerifiedTest.php index e36c3031..6e4494d8 100644 --- a/tests/Unit/App/Http/Middleware/EnsureCustomerEmailIsVerifiedTest.php +++ b/tests/Feature/App/Http/Middleware/EnsureCustomerEmailIsVerifiedTest.php @@ -2,6 +2,8 @@ declare(strict_types=1); +namespace Tests\Feature\App\Http\Middleware; + use App\Http\Middleware\EnsureCustomerEmailIsVerified; use App\Models\Customer; use Illuminate\Http\RedirectResponse; @@ -11,9 +13,6 @@ use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\URL; use Infrastructure\Adapters\Services\AppCustomerAuthService; use Symfony\Component\HttpKernel\Exception\HttpException; -use Tests\TestCase; - -uses(TestCase::class); describe('EnsureCustomerEmailIsVerified', function () { it('redirects to fo.auth.verification.notice if customer is not verified', function () { diff --git a/tests/Unit/App/Dto/PageDtoTest.php b/tests/Integration/WithApp/App/Dto/PageDtoTest.php similarity index 97% rename from tests/Unit/App/Dto/PageDtoTest.php rename to tests/Integration/WithApp/App/Dto/PageDtoTest.php index 3cdf6b9f..d567676e 100644 --- a/tests/Unit/App/Dto/PageDtoTest.php +++ b/tests/Integration/WithApp/App/Dto/PageDtoTest.php @@ -2,6 +2,8 @@ declare(strict_types=1); +namespace Tests\Integration\WithApp\App\Dto; + use App\Dto\PageDto; use App\Models\Page; use Domain\Enums\StaticPageSlug; diff --git a/tests/Unit/Infra/Adapters/Services/AppAdminAuthServiceTest.php b/tests/Integration/WithApp/Infra/Adapters/Services/AppAdminAuthServiceTest.php similarity index 98% rename from tests/Unit/Infra/Adapters/Services/AppAdminAuthServiceTest.php rename to tests/Integration/WithApp/Infra/Adapters/Services/AppAdminAuthServiceTest.php index 0721233d..9fbd43ee 100644 --- a/tests/Unit/Infra/Adapters/Services/AppAdminAuthServiceTest.php +++ b/tests/Integration/WithApp/Infra/Adapters/Services/AppAdminAuthServiceTest.php @@ -2,6 +2,8 @@ declare(strict_types=1); +namespace Tests\Integration\WithApp\Infra\Adapters\Services; + use App\Models\User; use Domain\Exceptions\AuthServiceException; use Illuminate\Contracts\Auth\StatefulGuard; diff --git a/tests/Unit/Infra/Adapters/Services/AppCustomerAuthServiceTest.php b/tests/Integration/WithApp/Infra/Adapters/Services/AppCustomerAuthServiceTest.php similarity index 98% rename from tests/Unit/Infra/Adapters/Services/AppCustomerAuthServiceTest.php rename to tests/Integration/WithApp/Infra/Adapters/Services/AppCustomerAuthServiceTest.php index 2513ab63..5ec42471 100644 --- a/tests/Unit/Infra/Adapters/Services/AppCustomerAuthServiceTest.php +++ b/tests/Integration/WithApp/Infra/Adapters/Services/AppCustomerAuthServiceTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Tests\Unit\Infra\Adapters\Services; +namespace Tests\Integration\WithApp\Infra\Adapters\Services; use App\Exceptions\CrmServiceException; use App\Models\Customer; @@ -15,7 +15,6 @@ use Domain\Models\ValueObjects\Email; use Domain\Services\ShopperService; use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Contracts\Auth\StatefulGuard; -use Illuminate\Contracts\Debug\ExceptionHandler; use Infrastructure\Adapters\Services\AppCustomerAuthService; use Mockery; use Ramsey\Uuid\Uuid; @@ -388,8 +387,6 @@ describe('AppCustomerAuthService', function (): void { $hashcode = new CrmHashcode(Uuid::uuid4()); $customer->hashcode = $hashcode; - app()->instance(ExceptionHandler::class, Mockery::mock(ExceptionHandler::class)->shouldIgnoreMissing()); - $exception = new CrmServiceException('Crm Error'); $crmService->shouldReceive('getCustomerFromHashCode')->with($customer->hashcode)->andReturn($exception); diff --git a/tests/Unit/App/Actions/Common/ChangeModelOrderPositionInputTest.php b/tests/Unit/App/Cqs/Actions/Common/ChangeModelOrderPositionInputTest.php similarity index 100% rename from tests/Unit/App/Actions/Common/ChangeModelOrderPositionInputTest.php rename to tests/Unit/App/Cqs/Actions/Common/ChangeModelOrderPositionInputTest.php diff --git a/tests/Unit/App/Actions/Common/ExecuteMassActionInputTest.php b/tests/Unit/App/Cqs/Actions/Common/ExecuteMassActionInputTest.php similarity index 100% rename from tests/Unit/App/Actions/Common/ExecuteMassActionInputTest.php rename to tests/Unit/App/Cqs/Actions/Common/ExecuteMassActionInputTest.php diff --git a/tests/Unit/App/Actions/Customers/RegisterCustomerInputTest.php b/tests/Unit/App/Cqs/Actions/Customers/RegisterCustomerInputTest.php similarity index 100% rename from tests/Unit/App/Actions/Customers/RegisterCustomerInputTest.php rename to tests/Unit/App/Cqs/Actions/Customers/RegisterCustomerInputTest.php diff --git a/tests/Unit/App/Actions/Discounts/CreateDiscountInputTest.php b/tests/Unit/App/Cqs/Actions/Discounts/CreateDiscountInputTest.php similarity index 100% rename from tests/Unit/App/Actions/Discounts/CreateDiscountInputTest.php rename to tests/Unit/App/Cqs/Actions/Discounts/CreateDiscountInputTest.php diff --git a/tests/Unit/App/Actions/Discounts/UpdateDiscountInputTest.php b/tests/Unit/App/Cqs/Actions/Discounts/UpdateDiscountInputTest.php similarity index 100% rename from tests/Unit/App/Actions/Discounts/UpdateDiscountInputTest.php rename to tests/Unit/App/Cqs/Actions/Discounts/UpdateDiscountInputTest.php diff --git a/tests/Unit/App/Actions/Faqs/CreateFaqInputTest.php b/tests/Unit/App/Cqs/Actions/Faqs/CreateFaqInputTest.php similarity index 100% rename from tests/Unit/App/Actions/Faqs/CreateFaqInputTest.php rename to tests/Unit/App/Cqs/Actions/Faqs/CreateFaqInputTest.php diff --git a/tests/Unit/App/Actions/Faqs/UpdateFaqInputTest.php b/tests/Unit/App/Cqs/Actions/Faqs/UpdateFaqInputTest.php similarity index 100% rename from tests/Unit/App/Actions/Faqs/UpdateFaqInputTest.php rename to tests/Unit/App/Cqs/Actions/Faqs/UpdateFaqInputTest.php diff --git a/tests/Unit/App/Actions/Orders/ApplyPickTimeSlotTest.php b/tests/Unit/App/Cqs/Actions/Orders/ApplyPickTimeSlotTest.php similarity index 100% rename from tests/Unit/App/Actions/Orders/ApplyPickTimeSlotTest.php rename to tests/Unit/App/Cqs/Actions/Orders/ApplyPickTimeSlotTest.php diff --git a/tests/Unit/App/Actions/Orders/CancelOrderTest.php b/tests/Unit/App/Cqs/Actions/Orders/CancelOrderTest.php similarity index 100% rename from tests/Unit/App/Actions/Orders/CancelOrderTest.php rename to tests/Unit/App/Cqs/Actions/Orders/CancelOrderTest.php diff --git a/tests/Unit/App/Actions/Orders/InitializeOrderTunnelTest.php b/tests/Unit/App/Cqs/Actions/Orders/InitializeOrderTunnelTest.php similarity index 100% rename from tests/Unit/App/Actions/Orders/InitializeOrderTunnelTest.php rename to tests/Unit/App/Cqs/Actions/Orders/InitializeOrderTunnelTest.php diff --git a/tests/Unit/App/Actions/Orders/PlacePendingOrderTest.php b/tests/Unit/App/Cqs/Actions/Orders/PlacePendingOrderTest.php similarity index 100% rename from tests/Unit/App/Actions/Orders/PlacePendingOrderTest.php rename to tests/Unit/App/Cqs/Actions/Orders/PlacePendingOrderTest.php diff --git a/tests/Unit/App/Actions/Pages/UpdatePageInputTest.php b/tests/Unit/App/Cqs/Actions/Pages/UpdatePageInputTest.php similarity index 100% rename from tests/Unit/App/Actions/Pages/UpdatePageInputTest.php rename to tests/Unit/App/Cqs/Actions/Pages/UpdatePageInputTest.php diff --git a/tests/Unit/App/Actions/PickupExceptions/CreatePickupExceptionInputTest.php b/tests/Unit/App/Cqs/Actions/PickupExceptions/CreatePickupExceptionInputTest.php similarity index 100% rename from tests/Unit/App/Actions/PickupExceptions/CreatePickupExceptionInputTest.php rename to tests/Unit/App/Cqs/Actions/PickupExceptions/CreatePickupExceptionInputTest.php diff --git a/tests/Unit/App/Actions/PickupExceptions/UpdatePickupExceptionInputTest.php b/tests/Unit/App/Cqs/Actions/PickupExceptions/UpdatePickupExceptionInputTest.php similarity index 100% rename from tests/Unit/App/Actions/PickupExceptions/UpdatePickupExceptionInputTest.php rename to tests/Unit/App/Cqs/Actions/PickupExceptions/UpdatePickupExceptionInputTest.php diff --git a/tests/Unit/App/Actions/ProductIncos/AssociateProductIncoInputTest.php b/tests/Unit/App/Cqs/Actions/ProductIncos/AssociateProductIncoInputTest.php similarity index 100% rename from tests/Unit/App/Actions/ProductIncos/AssociateProductIncoInputTest.php rename to tests/Unit/App/Cqs/Actions/ProductIncos/AssociateProductIncoInputTest.php diff --git a/tests/Unit/App/Actions/Settings/UpdateSettingsInputTest.php b/tests/Unit/App/Cqs/Actions/Settings/UpdateSettingsInputTest.php similarity index 100% rename from tests/Unit/App/Actions/Settings/UpdateSettingsInputTest.php rename to tests/Unit/App/Cqs/Actions/Settings/UpdateSettingsInputTest.php diff --git a/tests/Unit/App/Actions/Shops/CreateShopInputTest.php b/tests/Unit/App/Cqs/Actions/Shops/CreateShopInputTest.php similarity index 100% rename from tests/Unit/App/Actions/Shops/CreateShopInputTest.php rename to tests/Unit/App/Cqs/Actions/Shops/CreateShopInputTest.php diff --git a/tests/Unit/App/Actions/Shops/UpdateShopInputTest.php b/tests/Unit/App/Cqs/Actions/Shops/UpdateShopInputTest.php similarity index 100% rename from tests/Unit/App/Actions/Shops/UpdateShopInputTest.php rename to tests/Unit/App/Cqs/Actions/Shops/UpdateShopInputTest.php diff --git a/tests/Unit/App/Actions/Shops/UpdateShopPickupExceptionsInputTest.php b/tests/Unit/App/Cqs/Actions/Shops/UpdateShopPickupExceptionsInputTest.php similarity index 100% rename from tests/Unit/App/Actions/Shops/UpdateShopPickupExceptionsInputTest.php rename to tests/Unit/App/Cqs/Actions/Shops/UpdateShopPickupExceptionsInputTest.php diff --git a/tests/Unit/App/Actions/Slides/UpdateSlideInputTest.php b/tests/Unit/App/Cqs/Actions/Slides/UpdateSlideInputTest.php similarity index 100% rename from tests/Unit/App/Actions/Slides/UpdateSlideInputTest.php rename to tests/Unit/App/Cqs/Actions/Slides/UpdateSlideInputTest.php diff --git a/tests/Unit/App/Actions/Tags/CreateTagInputTest.php b/tests/Unit/App/Cqs/Actions/Tags/CreateTagInputTest.php similarity index 100% rename from tests/Unit/App/Actions/Tags/CreateTagInputTest.php rename to tests/Unit/App/Cqs/Actions/Tags/CreateTagInputTest.php diff --git a/tests/Unit/App/Actions/Tags/UpdateTagInputTest.php b/tests/Unit/App/Cqs/Actions/Tags/UpdateTagInputTest.php similarity index 100% rename from tests/Unit/App/Actions/Tags/UpdateTagInputTest.php rename to tests/Unit/App/Cqs/Actions/Tags/UpdateTagInputTest.php diff --git a/tests/Unit/App/Queries/Orders/GetBasketSummaryQueryTest.php b/tests/Unit/App/Cqs/Queries/Orders/GetBasketSummaryQueryTest.php similarity index 100% rename from tests/Unit/App/Queries/Orders/GetBasketSummaryQueryTest.php rename to tests/Unit/App/Cqs/Queries/Orders/GetBasketSummaryQueryTest.php diff --git a/tests/Unit/App/Queries/Orders/GetOrderConfirmationQueryTest.php b/tests/Unit/App/Cqs/Queries/Orders/GetOrderConfirmationQueryTest.php similarity index 100% rename from tests/Unit/App/Queries/Orders/GetOrderConfirmationQueryTest.php rename to tests/Unit/App/Cqs/Queries/Orders/GetOrderConfirmationQueryTest.php diff --git a/tests/Unit/App/Queries/Orders/GetPickTimeSlotQueryTest.php b/tests/Unit/App/Cqs/Queries/Orders/GetPickTimeSlotQueryTest.php similarity index 100% rename from tests/Unit/App/Queries/Orders/GetPickTimeSlotQueryTest.php rename to tests/Unit/App/Cqs/Queries/Orders/GetPickTimeSlotQueryTest.php diff --git a/tests/Unit/App/Queries/ProductIncos/GetArcadiaIncoPreviewQueryTest.php b/tests/Unit/App/Cqs/Queries/ProductIncos/GetArcadiaIncoPreviewQueryTest.php similarity index 100% rename from tests/Unit/App/Queries/ProductIncos/GetArcadiaIncoPreviewQueryTest.php rename to tests/Unit/App/Cqs/Queries/ProductIncos/GetArcadiaIncoPreviewQueryTest.php