Changes

- Add a migration file to use
- Remove .sqlite files and run in memory
- Remove statements psalm states are unnecessary

Author: rappasoft

README.md

@@ -618,11 +618,17 @@ The final result would look like:
 
 - [x] Bootstrap 4 Template
 - [x] Bootstrap 5 Template
-- [ ] Sorting By Relationships
-- [ ] Test Suite
+- [x] Sorting By Relationships
+- [ ] Test Suite (WIP)
 - [ ] Column Search
 - [ ] Greater Configurability
 
+## Testing
+
+```bash
+composer test
+```
+
 ## Changelog
 
 Please see [CHANGELOG](CHANGELOG.md) for more information on what has changed recently.

tests.sqlite

@@ -3,7 +3,6 @@
 namespace Rappasoft\LaravelLivewireTables\Tests;
 
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
-use Illuminate\Database\Eloquent\Builder;
 use Rappasoft\LaravelLivewireTables\DataTableComponent;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 
@@ -15,34 +14,25 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->table = $table = new PetsTable();
+        $this->table = new PetsTable();
     }
 
     /** @test */
-    public function bootstrap_test_datatable()
+    public function bootstrap_test_datatable(): void
     {
         $this->assertInstanceOf(DataTableComponent::class, $this->table);
     }
 
     /** @test */
-    public function test_query()
-    {
-        $query = $this->table->query();
-
-        $this->assertInstanceOf(Builder::class, $query);
-    }
-
-    /** @test */
-    public function test_columns()
+    public function test_columns(): void
     {
         $columns = $this->table->columns();
 
-        $this->assertIsArray($columns);
         $this->assertCount(5, $columns);
     }
 
     /** @test */
-    public function test_rows()
+    public function test_rows(): void
     {
         $rows = $this->table->rows;
 
@@ -51,22 +41,22 @@ public function test_rows()
     }
 
     /** @test */
-    public function test_search_filter()
+    public function test_search_filter(): void
     {
         $this->table->filters['search'] = 'Cartman';
         $this->assertEquals(1, $this->table->getRowsProperty()->total());
     }
 
     /** @test */
-    public function test_search_filter_reset()
+    public function test_search_filter_reset(): void
     {
         $this->table->filters['search'] = 'Cartman';
         $this->table->resetFilters();
         $this->assertEquals(1, $this->table->rows->total());
     }
 
     /** @test */
-    public function test_search_filter_remove()
+    public function test_search_filter_remove(): void
     {
         $this->table->filters['search'] = 'Cartman';
         $this->table->removeFilter('search');

tests/DataTableComponentTest.php

@@ -2,18 +2,15 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests;
 
-use Illuminate\Database\Capsule\Manager as DB;
-use Illuminate\Database\Schema\Blueprint;
-use Livewire\LivewireServiceProvider;
 use Orchestra\Testbench\TestCase as Orchestra;
 use Rappasoft\LaravelLivewireTables\LaravelLivewireTablesServiceProvider;
+use Rappasoft\LaravelLivewireTables\Tests\Database\Migrations\CreateTestTables;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Breed;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Species;
 
 class TestCase extends Orchestra
 {
-    protected $db;
 
     /**
      * Setup the test environment.
@@ -22,40 +19,13 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->db = $db = new DB;
-
-        // grab database
-        $database = $this->app['config']['database']['connections']['sqlite']['database'];
-
-        // setup connection
-        $db->addConnection([
-            'driver' => 'sqlite',
-            'database' => $database,
-        ]);
-
-        $db->setAsGlobal();
-
-        // setup species table
-        $this->db->connection()->getSchemaBuilder()->create('species', function (Blueprint $table) {
-            $table->id();
-            $table->string('name');
-        });
-
         Species::insert([
             [ 'id' => 1, 'name' => 'Cat', ],
             [ 'id' => 2, 'name' => 'Dog', ],
             [ 'id' => 3, 'name' => 'Horse', ],
             [ 'id' => 4, 'name' => 'Bird', ],
         ]);
 
-        // setup breeds table
-        $this->db->connection()->getSchemaBuilder()->create('breeds', function (Blueprint $table) {
-            $table->id();
-            $table->string('name');
-            $table->integer('species_id')->unsigned();
-            $table->foreign('species_id')->references('id')->on('species');
-        });
-
         Breed::insert([
             [ 'id' => 1, 'name' => 'American Shorthair', 'species_id' => 1, ],
             [ 'id' => 2, 'name' => 'Maine Coon', 'species_id' => 1, ],
@@ -69,18 +39,6 @@ protected function setUp(): void
             [ 'id' => 202, 'name' => 'Mustang', 'species_id' => 3, ],
         ]);
 
-        // setup user table
-        $this->db->connection()->getSchemaBuilder()->create('pets', function (Blueprint $table) {
-            $table->id();
-            $table->string('name')->index();
-            $table->string('age')->nullable();
-            $table->date('last_visit')->nullable();
-            $table->integer('species_id')->unsigned()->nullable();
-            $table->integer('breed_id')->unsigned()->nullable();
-            $table->foreign('species_id')->references('id')->on('species');
-            $table->foreign('breed_id')->references('id')->on('breeds');
-        });
-
         Pet::insert([
             [ 'id' => 1, 'name' => 'Cartman', 'age' => 22, 'species_id' => 1, 'breed_id' => 4 ],
             [ 'id' => 2, 'name' => 'Tux', 'age' => 8, 'species_id' => 1, 'breed_id' => 4 ],
@@ -93,20 +51,19 @@ protected function setUp(): void
     protected function getPackageProviders($app)
     {
         return [
-            //LivewireServiceProvider::class,
             LaravelLivewireTablesServiceProvider::class,
         ];
     }
 
     public function getEnvironmentSetUp($app)
     {
-        $app['config']->set('app.debug', true);
         $app['config']->set('database.default', 'sqlite');
         $app['config']->set('database.connections.sqlite', [
             'driver' => 'sqlite',
-            //'database' => 'tests/tests.sqlite',
-            'database' => tempnam(sys_get_temp_dir(), 'LaravelLivewireTables'),
+            'database' => ':memory:',
             'prefix' => '',
         ]);
+
+        resolve(CreateTestTables::class)->up();
     }
 }

tests/TestCase.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Database\Migrations;
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateTestTables extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('species', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+        });
+
+        Schema::create('breeds', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+            $table->integer('species_id')->unsigned();
+            $table->foreign('species_id')->references('id')->on('species');
+        });
+
+        Schema::create('pets', function (Blueprint $table) {
+            $table->id();
+            $table->string('name')->index();
+            $table->string('age')->nullable();
+            $table->date('last_visit')->nullable();
+            $table->integer('species_id')->unsigned()->nullable();
+            $table->integer('breed_id')->unsigned()->nullable();
+            $table->foreign('species_id')->references('id')->on('species');
+            $table->foreign('breed_id')->references('id')->on('breeds');
+        });
+    }
+}