diff --git a/tests/Feature/App/Http/Controllers/Bo/OrdersControllerTest.php b/tests/Feature/App/Http/Controllers/Bo/OrdersControllerTest.php
index 8195317e..ae7a39b8 100644
--- a/tests/Feature/App/Http/Controllers/Bo/OrdersControllerTest.php
+++ b/tests/Feature/App/Http/Controllers/Bo/OrdersControllerTest.php
@@ -31,6 +31,8 @@ use Money\Currency;
use Money\Money;
use Ramsey\Uuid\Uuid;
+use function Pest\Laravel\get;
+
describe('Bo\OrdersController', function (): void {
beforeEach(function (): void {
/** @var \Tests\TestCase $this */
@@ -387,7 +389,6 @@ describe('Bo\OrdersController', function (): void {
});
it('filters orders by string status query parameter and marks selected option in view', function (): void {
- /** @var \Tests\TestCase $this */
// GIVEN
$shop = Shop::factory()->create();
$validated = Order::query()->forceCreate([
@@ -407,7 +408,7 @@ describe('Bo\OrdersController', function (): void {
'delivery_address' => new DeliveryAddress('Shop Name', 'Address', '75000', 'Paris'),
'pickup_day' => Date::now()->toDateString(),
]);
- Order::query()->forceCreate([
+ $failed = Order::query()->forceCreate([
'id' => Uuid::uuid7()->toString(),
'shop_id' => $shop->id,
'reference' => new OrderReference(Uuid::uuid7()),
@@ -426,21 +427,37 @@ describe('Bo\OrdersController', function (): void {
]);
// WHEN
- $response = $this->get('/bo/orders?status=validated');
- $legacyResponse = $this->get('/bo/orders?status=1');
+ $response = get('/bo/orders?status=validated');
// THEN
$response->assertOk()
->assertSessionHas('orders.filter.status', OrderStatus::VALIDATED)
- ->assertSee('value="validated"', false)
- ->assertSee('value="failed"', false)
- ->assertSee('value="pending"', false);
+ ->assertSee('', false)
+ ->assertSee('', false)
+ ->assertSee('', false);
/** @var \Illuminate\Pagination\LengthAwarePaginator $orders */
$orders = $response->viewData('orders');
expect($orders->total())->toBe(1)
->and($orders->first()?->id)->toBe($validated->id);
+ // WHEN
+ $failedResponse = get('/bo/orders?status=failed');
+
+ // THEN
+ $failedResponse->assertOk()
+ ->assertSessionHas('orders.filter.status', OrderStatus::FAILED)
+ ->assertSee('', false);
+
+ /** @var \Illuminate\Pagination\LengthAwarePaginator $failedOrders */
+ $failedOrders = $failedResponse->viewData('orders');
+ expect($failedOrders->total())->toBe(1)
+ ->and($failedOrders->first()?->id)->toBe($failed->id);
+
+ // WHEN
+ $legacyResponse = get('/bo/orders?status=1');
+
+ // THEN
$legacyResponse->assertSessionHasErrors('status');
});
});
diff --git a/tests/Unit/Domain/Enums/OrderStatusTest.php b/tests/Unit/Domain/Enums/OrderStatusTest.php
index 31af37a1..5f2a9561 100644
--- a/tests/Unit/Domain/Enums/OrderStatusTest.php
+++ b/tests/Unit/Domain/Enums/OrderStatusTest.php
@@ -60,15 +60,31 @@ describe('OrderStatus', function (): void {
$resolve = static fn (string $value): ?OrderStatus => OrderStatus::tryFrom($value);
// WHEN
- $resolvedValid = $resolve('validated');
- $resolvedLegacy1 = $resolve('1');
- $resolvedLegacy3 = $resolve('3');
- $resolvedUnknown = $resolve('VALIDATED');
+ $resolvedValid = [
+ $resolve('waiting'),
+ $resolve('pending'),
+ $resolve('validated'),
+ $resolve('failed'),
+ $resolve('canceled'),
+ ];
+ $resolvedLegacy = [
+ $resolve('1'),
+ $resolve('2'),
+ $resolve('3'),
+ $resolve('4'),
+ $resolve('7'),
+ ];
+ $resolvedUppercase = $resolve('VALIDATED');
// THEN
- expect($resolvedValid)->toBe(OrderStatus::VALIDATED)
- ->and($resolvedLegacy1)->toBeNull()
- ->and($resolvedLegacy3)->toBeNull()
- ->and($resolvedUnknown)->toBeNull();
+ expect($resolvedValid)->toBe([
+ OrderStatus::WAITING,
+ OrderStatus::PENDING,
+ OrderStatus::VALIDATED,
+ OrderStatus::FAILED,
+ OrderStatus::CANCELED,
+ ])
+ ->and($resolvedLegacy)->toBe([null, null, null, null, null])
+ ->and($resolvedUppercase)->toBeNull();
});
});