Merge pull request #311 from CodeWithDennis/more-tests-and-minor-fix

More tests and minor fix

Author: CodeWithDennis

resources/views/resources/pages/index/can-render-column.blade.php

@@ -1,4 +1,4 @@
 it('can render `:dataset` column', function (string $column): void {
     livewire({{ $getPageClass('index') }}::class)
         ->assertCanRenderTableColumn($column);
-})->with([@foreach ($getResourceTableVisibleColumnKeys() as $column)'{{ $column }}',@endforeach]);
+})->with([@foreach ($getResourceTableDefaultVisibleColumnKeys() as $column)'{{ $column }}',@endforeach]);

resources/views/resources/pages/index/cannot-render-column.blade.php

@@ -1,4 +1,4 @@
 it('cannot render `:dataset` column', function (string $column): void {
     livewire({{ $getPageClass('index') }}::class)
         ->assertCanNotRenderTableColumn($column);
-})->with([@foreach ($getResourceHiddenTableColumnKeys() as $column)'{{ $column }}',@endforeach]);
+})->with([@foreach ($getResourceTableDefaultHiddenColumnKeys() as $column)'{{ $column }}',@endforeach]);

resources/views/resources/pages/index/has-column.blade.php

@@ -0,0 +1,4 @@
+it('has `:dataset` column', function (string $column): void {
+    livewire({{ $getPageClass('index') }}::class)
+        ->assertTableColumnExists($column);
+})->with([@foreach ($getResourceTableColumnKeys() as $column)'{{ $column }}',@endforeach]);

resources/views/resources/pages/index/hides-column.blade.php

@@ -0,0 +1,4 @@
+it('hides `:dataset` column', function (string $column): void {
+    livewire({{ $getPageClass('index') }}::class)
+        ->assertTableColumnHidden($column);
+})->with([@foreach ($getResourceHiddenTableColumnKeys() as $column)'{{ $column }}',@endforeach]);

resources/views/resources/pages/index/shows-column.blade.php

@@ -0,0 +1,4 @@
+it('shows `:dataset` column', function (string $column): void {
+    livewire({{ $getPageClass('index') }}::class)
+        ->assertTableColumnVisible($column);
+})->with([@foreach ($getResourceTableVisibleColumnKeys() as $column)'{{ $column }}',@endforeach]);

src/Commands/FilamentTestsCommand.php

@@ -11,6 +11,9 @@
 use CodeWithDennis\FilamentTests\TestRenderers\Resources\Pages\Index\CanNotRenderColumnTest;
 use CodeWithDennis\FilamentTests\TestRenderers\Resources\Pages\Index\CanRenderColumnTest;
 use CodeWithDennis\FilamentTests\TestRenderers\Resources\Pages\Index\CanRenderIndexPageTest;
+use CodeWithDennis\FilamentTests\TestRenderers\Resources\Pages\Index\HasColumnTest;
+use CodeWithDennis\FilamentTests\TestRenderers\Resources\Pages\Index\HidesColumnTest;
+use CodeWithDennis\FilamentTests\TestRenderers\Resources\Pages\Index\ShowsColumnTest;
 use CodeWithDennis\FilamentTests\TestRenderers\Resources\Pages\View\CanRenderViewPageTest;
 use Illuminate\Console\Command;
 
@@ -31,9 +34,7 @@ public function handle(): void
         $this->resources = $this->askUserToSelectResourcesFromTheSelectedPanels();
 
         $this->generateTests();
-
         $this->showGenerationSummary();
-
         $this->runPintOnGeneratedTests();
     }
 
@@ -45,11 +46,14 @@ protected function getRenderers(): array
         return [
             BeforeEach::class,
             CanRenderIndexPageTest::class,
-            CanRenderColumnTest::class,
-            CanNotRenderColumnTest::class,
             CanRenderCreatePageTest::class,
             CanRenderEditPageTest::class,
             CanRenderViewPageTest::class,
+            CanRenderColumnTest::class,
+            CanNotRenderColumnTest::class,
+            HasColumnTest::class,
+            ShowsColumnTest::class,
+            HidesColumnTest::class,
         ];
     }
 }

src/Concerns/InteractsWithResources.php

@@ -7,6 +7,7 @@
 use CodeWithDennis\FilamentTests\Concerns\Resources\InteractsWithSchemas;
 use CodeWithDennis\FilamentTests\Concerns\Resources\InteractsWithTables;
 use ReflectionClass;
+use ReflectionException;
 
 trait InteractsWithResources
 {
@@ -15,6 +16,7 @@ trait InteractsWithResources
     use InteractsWithSchemas;
     use InteractsWithTables;
 
+    /** @throws ReflectionException */
     protected function getPrivateProperty(object $object, string $property): mixed
     {
         $reflection = new ReflectionClass($object);

src/Concerns/Resources/InteractsWithTables.php

@@ -17,42 +17,70 @@ public function getResourceTable(): Table
         ));
     }
 
+    private function getResourceTableColumnKeysFrom(Collection $columns): array
+    {
+        return $columns
+            ->map(fn (Column $column): string => $column->getName())
+            ->filter()
+            ->values()
+            ->all();
+    }
+
     public function getResourceTableColumns(): Collection
     {
         return collect($this->getResourceTable()->getColumns());
     }
 
-    public function getResourceVisibleTableColumns(): Collection
+    public function getResourceTableColumnKeys(): array
+    {
+        return $this->getResourceTableColumnKeysFrom($this->getResourceTableColumns());
+    }
+
+    public function getResourceTableDefaultVisibleColumns(): Collection
+    {
+        return $this->getResourceTableColumns()
+            ->filter(fn (Column $column): bool => $column->isVisible() && ! $column->isToggledHiddenByDefault());
+    }
+
+    public function getResourceTableDefaultVisibleColumnKeys(): array
+    {
+        return $this->getResourceTableColumnKeysFrom($this->getResourceTableDefaultVisibleColumns());
+    }
+
+    public function getResourceTableDefaultHiddenColumns(): Collection
+    {
+        return $this->getResourceTableColumns()
+            ->filter(fn (Column $column): bool => ! $column->isVisible() || $column->isToggledHiddenByDefault());
+    }
+
+    public function getResourceTableDefaultHiddenColumnKeys(): array
+    {
+        return $this->getResourceTableColumnKeysFrom($this->getResourceTableDefaultHiddenColumns());
+    }
+
+    public function getResourceTableVisibleColumns(): Collection
     {
         return $this->getResourceTableColumns()
             ->filter(fn (Column $column): bool => $column->isVisible());
     }
 
     public function getResourceTableVisibleColumnKeys(): array
     {
-        return $this->getResourceVisibleTableColumns()
-            ->map(fn (Column $column): string => $column->getName())
-            ->filter()
-            ->values()
-            ->all();
+        return $this->getResourceTableColumnKeysFrom($this->getResourceTableVisibleColumns());
     }
 
-    public function getResourceHiddenTableColumns(): Collection
+    public function getResourceTableHiddenColumns(): Collection
     {
         return $this->getResourceTableColumns()
             ->filter(fn (Column $column): bool => $column->isHidden());
     }
 
-    public function getResourceHiddenTableColumnKeys(): array
+    public function getResourceTableHiddenColumnKeys(): array
     {
-        return $this->getResourceHiddenTableColumns()
-            ->map(fn (Column $column): string => $column->getName())
-            ->filter()
-            ->values()
-            ->all();
+        return $this->getResourceTableColumnKeysFrom($this->getResourceTableHiddenColumns());
     }
 
-    public function getResourceSortableTableColumns(): Collection
+    public function getResourceTableSortableColumns(): Collection
     {
         return $this->getResourceTableColumns()
             ->filter(fn (Column $column): bool => $column->isSortable());

src/TestRenderers/Resources/Pages/Index/CanNotRenderColumnTest.php

@@ -11,6 +11,6 @@ class CanNotRenderColumnTest extends BaseTest
     public function getShouldRender(): bool
     {
         return $this->hasPage('index')
-            && $this->getResourceHiddenTableColumns()->isNotEmpty();
+            && $this->getResourceTableDefaultHiddenColumns()->isNotEmpty();
     }
 }

src/TestRenderers/Resources/Pages/Index/CanRenderColumnTest.php

@@ -11,6 +11,6 @@ class CanRenderColumnTest extends BaseTest
     public function getShouldRender(): bool
     {
         return $this->hasPage('index')
-            && $this->getResourceVisibleTableColumns()->isNotEmpty();
+            && $this->getResourceTableDefaultVisibleColumns()->isNotEmpty();
     }
 }