Fix tests

Author: dvlpp

src/Exceptions/SharpInvalidFilterValueException.php

@@ -2,8 +2,6 @@
 
 namespace Code16\Sharp\Filters;
 
-use Code16\Sharp\Exceptions\SharpInvalidFilterValueException;
-
 abstract class GlobalRequiredFilter extends SelectRequiredFilter
 {
     private mixed $currentValue = null;
@@ -15,7 +13,7 @@ final public function currentValue(): mixed
             : $this->defaultValue();
     }
 
-    final public function setCurrentValue(mixed $value, bool $throwIfInvalid = true): void
+    final public function setCurrentValue(mixed $value): void
     {
         if ($value === null) {
             $this->currentValue = null;
@@ -27,10 +25,6 @@ final public function setCurrentValue(mixed $value, bool $throwIfInvalid = true)
             ->where('id', $value)
             ->first();
 
-        if ($throwIfInvalid && ! $formattedValue) {
-            throw new SharpInvalidFilterValueException('['.$value.'] is not a valid value for this filter.');
-        }
-
         $this->currentValue = $formattedValue['id'] ?? null;
     }
 

src/Filters/GlobalRequiredFilter.php

@@ -14,7 +14,7 @@ public function update(string $filterKey, GlobalFilters $globalFilters): Redirec
 
         abort_if(! $handler instanceof GlobalRequiredFilter, 404);
 
-        $handler->setCurrentValue(request('value'), throwIfInvalid: false);
+        $handler->setCurrentValue(request('value'));
 
         return redirect()->route('code16.sharp.home', [
             'filterKey' => sharp()->context()->globalFilterUrlSegmentValue(),

src/Http/Controllers/GlobalFilterController.php

@@ -3,7 +3,6 @@
 namespace Code16\Sharp\Http\Middleware;
 
 use Closure;
-use Code16\Sharp\Exceptions\SharpInvalidFilterValueException;
 use Code16\Sharp\Filters\GlobalFilters\GlobalFilters;
 use Code16\Sharp\Filters\GlobalRequiredFilter;
 use Illuminate\Http\Request;
@@ -23,14 +22,10 @@ public function handle(Request $request, Closure $next)
                 return redirect()->route('code16.sharp.home');
             }
 
-            try {
-                collect($this->globalFiltersHandler->getFilters())
-                    ->each(fn (GlobalRequiredFilter $globalFilter, int $index) => $globalFilter
-                        ->setCurrentValue($filterKeys[$index])
-                    );
-            } catch (SharpInvalidFilterValueException) {
-                abort(404);
-            }
+            collect($this->globalFiltersHandler->getFilters())
+                ->each(fn (GlobalRequiredFilter $globalFilter, int $index) => $globalFilter
+                    ->setCurrentValue($filterKeys[$index])
+                );
         }
 
         URL::defaults(['filterKey' => sharp()->context()->globalFilterUrlSegmentValue()]);

src/Http/Middleware/HandleGlobalFilters.php

@@ -77,12 +77,9 @@ public function defaultValue(): mixed
             ->where('globalFilters.filterValues.default.test', 2)
         );
 
-    $this
-        ->post(route('code16.sharp.filters.update', 'test'), ['value' => 3]);
-
     $this
         ->followingRedirects()
-        ->get('/sharp/s-list/person')
+        ->get('/sharp/3/s-list/person')
         ->assertInertia(fn (Assert $page) => $page
             ->has('globalFilters.config.filters._root.0', fn (Assert $filter) => $filter
                 ->where('key', 'test')

tests/Http/GlobalFilterControllerTest.php

@@ -39,11 +39,6 @@
 
     $this->get('/sharp/s-list/person')
         ->assertRedirect('/sharp/two/s-list/person');
-
-    $this->post(route('code16.sharp.filters.update', 'test'), ['value' => 'three']);
-
-    $this->get('/sharp/s-list/person/s-show/person/1')
-        ->assertRedirect('/sharp/three/s-list/person/s-show/person/1');
 });
 
 it('sets the current filterKey according to the URL', function () {
@@ -60,7 +55,7 @@
     fakeGlobalFilter();
 
     $this->get('/sharp/five/s-list/person/s-show/person/1')
-        ->assertNotFound();
+        ->assertOk();
 
     expect(sharp()->context()->globalFilterValue('test'))->toEqual('two');
 });
@@ -71,12 +66,6 @@
 
     $this->get('/sharp/s-list/person')
         ->assertRedirect('/sharp/two~two/s-list/person');
-
-    $this->post(route('code16.sharp.filters.update', 'test1'), ['value' => 'one']);
-    $this->post(route('code16.sharp.filters.update', 'test2'), ['value' => 'three']);
-
-    $this->get('/sharp/s-list/person/s-show/person/1')
-        ->assertRedirect('/sharp/one~three/s-list/person/s-show/person/1');
 });
 
 it('sets the current multiple filterKeys according to the URL', function () {