fix tests

composer.json

@@ -42,7 +42,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Tests\\" : "tests/"
+            "PowerComponents\\LivewirePowerGrid\\Tests\\" : "tests/"
         }
     }
 }

tests/Feature/PowerGridComponentFilterNameOptionsTest.php

@@ -2,11 +2,14 @@
 
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
-use PowerComponents\LivewirePowerGrid\PowerGrid;
 use PowerComponents\LivewirePowerGrid\PowerGridComponent;
 
 beforeEach(function () {
     $this->component = new PowerGridComponent;
+    $this->columns = [
+        'id',
+        'name'
+    ];
 });
 
 it('clean filters', function () {
@@ -24,13 +27,6 @@
 
 it('properly filters by "name is"', function () {
 
-/*
-        $pg = new PowerGridComponent();
-        $filters = $pg->filters;
-        $model = Dish::query();
-
-*/
-
     $data = new Collection([
         new ModelStub([
             'id'   => '1',
@@ -51,7 +47,12 @@
         ]
     ];
 
-    $filtered = \PowerComponents\LivewirePowerGrid\Helpers\Collection::filter($this->component->filters, $data);
+    $filtered = \PowerComponents\LivewirePowerGrid\Helpers\Collection::query($data)
+        ->setColumns($this->columns)
+        ->setSearch('')
+        ->setFilters($this->component->filters)
+        ->filterContains()
+        ->filter();
 
     $this->assertCount(1,$filtered);
     $this->AssertEquals($filtered->first()->name, 'john');
@@ -78,7 +79,12 @@
         ]
     ];
 
-    $filtered = \PowerComponents\LivewirePowerGrid\Helpers\Collection::filter($this->component->filters, $data);
+    $filtered = \PowerComponents\LivewirePowerGrid\Helpers\Collection::query($data)
+        ->setColumns($this->columns)
+        ->setSearch('')
+        ->setFilters($this->component->filters)
+        ->filterContains()
+        ->filter();
     $this->assertEmpty($filtered);
 });
 
@@ -103,7 +109,12 @@
         ]
     ];
 
-    $filtered = \PowerComponents\LivewirePowerGrid\Helpers\Collection::filter($this->component->filters, $data);
+    $filtered = \PowerComponents\LivewirePowerGrid\Helpers\Collection::query($data)
+        ->setColumns($this->columns)
+        ->setSearch('')
+        ->setFilters($this->component->filters)
+        ->filterContains()
+        ->filter();
 
     $this->assertCount(1, $filtered);
     $this->AssertEquals($filtered->first()->name, 'john smith');
@@ -130,7 +141,12 @@
         ]
     ];
 
-    $filtered = \PowerComponents\LivewirePowerGrid\Helpers\Collection::filter($this->component->filters, $data);
+    $filtered = \PowerComponents\LivewirePowerGrid\Helpers\Collection::query($data)
+        ->setColumns($this->columns)
+        ->setSearch('')
+        ->setFilters($this->component->filters)
+        ->filterContains()
+        ->filter();
 
     $this->assertCount(2, $filtered);
 });

tests/Feature/PowerGridTest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace PowerComponents\LivewirePowerGrid\Tests;
+namespace PowerComponents\LivewirePowerGrid\Tests\Feature;
 
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
-use Tests\TestCase;
 use PowerComponents\LivewirePowerGrid\PowerGrid;
+use PowerComponents\LivewirePowerGrid\Tests\TestCase;
 
 class PowerGridTest extends TestCase
 {

tests/Pest.php

@@ -1,47 +1,9 @@
 <?php
 
-use SebastianBergmann\CodeCoverage\Report\Xml\Tests;
+use Orchestra\Testbench\TestCase;
 
-/*
-|--------------------------------------------------------------------------
-| Test Case
-|--------------------------------------------------------------------------
-|
-| The closure you provide to your test functions is always bound to a specific PHPUnit test
-| case class. By default, that class is "PHPUnit\Framework\TestCase". Of course, you may
-| need to change it using the "uses()" function to bind a different classes or traits.
-|
-*/
-
-uses(\Orchestra\Testbench\TestCase::class)->in(__DIR__);
-
-/*
-|--------------------------------------------------------------------------
-| Expectations
-|--------------------------------------------------------------------------
-|
-| When you're writing tests, you often need to check that values meet certain conditions. The
-| "expect()" function gives you access to a set of "expectations" methods that you can use
-| to assert different things. Of course, you may extend the Expectation API at any time.
-|
-*/
+uses(TestCase::class)->in(__DIR__);
 
 expect()->extend('toBeOne', function () {
     return $this->toBe(1);
 });
-
-/*
-|--------------------------------------------------------------------------
-| Functions
-|--------------------------------------------------------------------------
-|
-| While Pest is very powerful out-of-the-box, you may have some testing code specific to your
-| project that you don't want to repeat in every file. Here you can also expose helpers as
-| global functions to help you to reduce the number of lines of code in your test files.
-|
-*/
-
-function something()
-{
-    // ..
-}

tests/TestCase.php

@@ -1,14 +1,13 @@
 <?php
 
-namespace Tests;
+namespace PowerComponents\LivewirePowerGrid\Tests;
 
 use PowerComponents\LivewirePowerGrid\Providers\PowerGridServiceProvider;
 
 class TestCase extends \Orchestra\Testbench\TestCase
 {
     protected function getPackageProviders($app)
     {
-
         return [
             PowerGridServiceProvider::class
         ];