Fix failing tests

Thavarshan · Apr 10, 2024 · 4a5fb11 · 4a5fb11
1 parent bf0172a
commit 4a5fb11
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.phpunit.cache/test-results b/.phpunit.cache/test-results
@@ -1 +1 @@
-{"version":1,"defects":{"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectly":8,"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectlyWhenDisabled":7,"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectlyWhenForced":7,"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectlyWhenForcedWithCustomTtl":7,"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectlyWhenForcedWithCustomKey":8,"Filterable\\Tests\\FilterTest::testAppliesPreFiltersCorrectly":8,"Filterable\\Tests\\FilterableTest::testFilter":8,"Filterable\\Tests\\FilterableTest::testFilterAppliesFiltersToModelQuery":8,"Filterable\\Tests\\FilterableTest::testFilterThrowsExceptionWhenFilterApplicationFails":8,"Filterable\\Tests\\FilterTest::testClearsCacheCorrectly":5},"times":{"Filterable\\Tests\\FilterTest::testAppliesFiltersDynamicallyBasedOnRequest":0.029,"Filterable\\Tests\\FilterTest::testAppliesFiltersDynamicallyBasedOnRequestWithCustomMethodNames":0.018,"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectly":0.017,"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectlyWhenDisabled":0.017,"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectlyWhenForced":0.017,"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectlyWhenForcedWithCustomTtl":0.017,"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectlyWhenForcedWithCustomKey":0.017,"Filterable\\Tests\\FilterTest::testClearsCacheCorrectly":0.015,"Filterable\\Tests\\FilterTest::testAppliesPreFiltersCorrectly":0.017,"Filterable\\Tests\\FilterTest::testSetsAndGetsOptionsCorrectly":0.014,"Filterable\\Tests\\FilterableTest::testFilter":0.061,"Filterable\\Tests\\FilterableTest::testFilterAppliesFiltersToModelQuery":0.05,"Filterable\\Tests\\FilterableTest::testFilterThrowsExceptionWhenFilterApplicationFails":0.015}}
+{"version":1,"defects":{"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectly":8,"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectlyWhenDisabled":7,"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectlyWhenForced":7,"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectlyWhenForcedWithCustomTtl":7,"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectlyWhenForcedWithCustomKey":8,"Filterable\\Tests\\FilterTest::testAppliesPreFiltersCorrectly":8,"Filterable\\Tests\\FilterableTest::testFilter":8,"Filterable\\Tests\\FilterableTest::testFilterAppliesFiltersToModelQuery":8,"Filterable\\Tests\\FilterableTest::testFilterThrowsExceptionWhenFilterApplicationFails":8,"Filterable\\Tests\\FilterTest::testClearsCacheCorrectly":5,"Filterable\\Tests\\FilterTest::testAppliesFiltersDynamicallyBasedOnRequest":7,"Filterable\\Tests\\FilterTest::testAppliesFiltersDynamicallyBasedOnRequestWithCustomMethodNames":7},"times":{"Filterable\\Tests\\FilterTest::testAppliesFiltersDynamicallyBasedOnRequest":0.03,"Filterable\\Tests\\FilterTest::testAppliesFiltersDynamicallyBasedOnRequestWithCustomMethodNames":0.019,"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectly":0.017,"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectlyWhenDisabled":0.019,"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectlyWhenForced":0.018,"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectlyWhenForcedWithCustomTtl":0.018,"Filterable\\Tests\\FilterTest::testHandlesCachingCorrectlyWhenForcedWithCustomKey":0.017,"Filterable\\Tests\\FilterTest::testClearsCacheCorrectly":0.016,"Filterable\\Tests\\FilterTest::testAppliesPreFiltersCorrectly":0.018,"Filterable\\Tests\\FilterTest::testSetsAndGetsOptionsCorrectly":0.015,"Filterable\\Tests\\FilterableTest::testFilter":0.061,"Filterable\\Tests\\FilterableTest::testFilterAppliesFiltersToModelQuery":0.053,"Filterable\\Tests\\FilterableTest::testFilterThrowsExceptionWhenFilterApplicationFails":0.015}}
diff --git a/src/Filterable/Filter.php b/src/Filterable/Filter.php
@@ -214,7 +214,7 @@ function () {
     protected function applyFiltersToQuery(): void
     {
         collect($this->getFilterables())
-            ->filter(fn (mixed $value) => (! is_string($value) && ! is_null($value))
+            ->filter(fn (mixed $value) => $value !== null
                 && $value !== ''
                 && $value !== false
                 && $value !== [])

diff --git a/tests/FilterTest.php b/tests/FilterTest.php
@@ -47,7 +47,7 @@ public function testAppliesFiltersDynamicallyBasedOnRequest(): void
         $builder = $model->newQuery();
 
         $cache = m::mock(Repository::class);
-        $cache->shouldReceive('remember')->andReturn($builder);
+        $cache->shouldNotReceive('remember')->andReturn($builder);
 
         // Assuming 'name' filter translates to a method call
         $filter = new MockFilter($request, $cache);
@@ -69,7 +69,7 @@ public function testAppliesFiltersDynamicallyBasedOnRequestWithCustomMethodNames
         $builder = $model->newQuery();
 
         $cache = m::mock(Repository::class);
-        $cache->shouldReceive('remember')->andReturn($builder);
+        $cache->shouldNotReceive('remember')->andReturn($builder);
 
         // Assuming 'name' filter translates to a method call
         $filter = new class ($request, $cache) extends Filter {
@@ -82,6 +82,7 @@ public function filterByName($name)
                 return $this->builder->where('name', 'LIKE', "%{$name}%");
             }
         };
+
         $filter->setUseCache(false);
 
         $results = $filter->apply($builder);