Add tests

Power-Components · Jul 18, 2024 · e72c4f6 · e72c4f6
1 parent 57720b1
commit e72c4f6
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 13 deletions.
diff --git a/src/Components/Actions/Macros.php b/src/Components/Actions/Macros.php
@@ -80,7 +80,7 @@ public static function boot(): void
                 "component" => "button",
                 "attribute" => "wire:click",
                 "value"     => function ($component, $row) {
-                    return 'toggleDetail(\'' . data_get($row, $component->primaryKey) . '\')';
+                    return 'toggleDetail(\'' . data_get($row, $component->realPrimaryKey) . '\')';
                 },
             ];
 

diff --git a/tests/Feature/Buttons/ToggleDetailTest.php b/tests/Feature/Buttons/ToggleDetailTest.php
@@ -1,8 +1,11 @@
 <?php
 
+use Illuminate\Database\Eloquent\Builder;
 use PowerComponents\LivewirePowerGrid\Button;
 use PowerComponents\LivewirePowerGrid\Tests\Concerns\Components\DishTableBase;
 
+use PowerComponents\LivewirePowerGrid\Tests\Concerns\Models\Dish;
+
 use function PowerComponents\LivewirePowerGrid\Tests\Plugins\livewire;
 
 $component = new class () extends DishTableBase {
@@ -16,17 +19,32 @@ public function actions($row): array
     }
 };
 
-dataset('action:toggleDetail', [
-    'tailwind'       => [$component::class, (object) ['theme' => 'tailwind', 'join' => false]],
-    'bootstrap'      => [$component::class, (object) ['theme' => 'bootstrap', 'join' => false]],
-    'tailwind join'  => [$component::class, (object) ['theme' => 'tailwind', 'join' => true]],
-    'bootstrap join' => [$component::class, (object) ['theme' => 'bootstrap', 'join' => true]],
-]);
+$dotNotationPrimaryKeyComponent = new class () extends DishTableBase {
+    public string $primaryKey = 'dishes.id';
+
+    public ?string $primaryKeyAlias = 'id';
+
+    public function dataSource(): Builder
+    {
+        return Dish::query()
+            ->join('categories as newCategories', function ($categories) {
+                $categories->on('dishes.category_id', '=', 'newCategories.id');
+            })
+            ->select('dishes.*', 'newCategories.name as category_name');
+    }
+
+    public function actions($row): array
+    {
+        return [
+            Button::make('toggleDetail')
+                ->slot('toggleDetail: ' . $row->id)
+                ->toggleDetail(),
+        ];
+    }
+};
 
 it('properly displays "toggleDetail" on edit button', function (string $component, object $params) {
-    livewire($component, [
-        'join' => $params->join,
-    ])
+    livewire($component)
         ->call($params->theme)
         ->set('setUp.footer.perPage', 6)
         ->assertSeeHtml("wire:click=\"toggleDetail(&#039;1&#039;)\">toggleDetail: 1</button>")
@@ -36,5 +54,25 @@ public function actions($row): array
         ->assertSeeHtml("wire:click=\"toggleDetail(&#039;7&#039;)\">toggleDetail: 7</button>")
         ->assertDontSeeHtml("wire:click=\"toggleDetail(&#039;1&#039;)\">toggleDetail: 1</button>");
 })
-    ->with('action:toggleDetail')
+    ->with([
+        'tailwind'  => [$component::class, (object) ['theme' => 'tailwind']],
+        'bootstrap' => [$component::class, (object) ['theme' => 'bootstrap']],
+    ])
+    ->group('action');
+
+it('properly displays "toggleDetail" on edit button using dot notation in primaryKey', function (string $component, object $params) {
+    livewire($component)
+        ->call($params->theme)
+        ->set('setUp.footer.perPage', 6)
+        ->assertSeeHtml("\"toggleDetail(&#039;1&#039;)\">toggleDetail: 1</button>")
+        ->assertSeeHtml("\"toggleDetail(&#039;2&#039;)\">toggleDetail: 2</button>")
+        ->assertDontSeeHtml("wire:click=\"toggleDetail(&#039;7&#039;)\">toggleDetail: 7</button>")
+        ->call('setPage', 2)
+        ->assertSeeHtml("wire:click=\"toggleDetail(&#039;7&#039;)\">toggleDetail: 7</button>")
+        ->assertDontSeeHtml("wire:click=\"toggleDetail(&#039;1&#039;)\">toggleDetail: 1</button>");
+})
+    ->with([
+        'tailwind join primary key alias'  => [$dotNotationPrimaryKeyComponent::class, (object) ['theme' => 'tailwind']],
+        'bootstrap join primary key alias' => [$dotNotationPrimaryKeyComponent::class, (object) ['theme' => 'bootstrap']],
+    ])
     ->group('action');
diff --git a/tests/Feature/DetailRowTest.php b/tests/Feature/DetailRowTest.php
@@ -110,7 +110,7 @@
     }
 
     $component->assertSeeHtmlInOrder($xData);
-})->skip();
+});
 
 it('collapse detail row with collapseOthers', function () {
     livewire(RulesToggleDetailTable::class, [
@@ -184,4 +184,4 @@
             4 => false,
             5 => false,
         ]);
-})->skip();
+});