diff --git a/tests/Http/Livewire/BaseTable.php b/tests/Http/Livewire/BaseTable.php new file mode 100644 index 000000000..98394bfba --- /dev/null +++ b/tests/Http/Livewire/BaseTable.php @@ -0,0 +1,62 @@ +setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3); + $this->setPaginationMethod($type); + $this->setDisplayPaginationDetailsEnabled(); + + } + + public function disableDetailedPagination(string $type = 'standard') + { + $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3); + $this->setPaginationMethod($type); + $this->setDisplayPaginationDetailsDisabled(); + } + + public function setPaginationTest(string $type) + { + $this->paginationTest = $type; + } + + public function bootAll() + { + $view = view('livewire-tables::datatable'); + + $this->boot(); + $this->bootedComponentUtilities(); + $this->bootedManagesFilters(); + $this->bootedWithColumns(); + $this->bootedWithColumnSelect(); + $this->booted(); + $this->mountManagesFilters(); + $this->mountComponentUtilities(); + $this->mountWithSorting(); + $this->renderAll($view); + } + + public function renderAll($view = null) + { + if (is_null($view)) { + $view = view('livewire-tables::datatable'); + } + $this->renderingWithColumns($view, $view->getData()); + $this->renderingWithColumnSelect($view, $view->getData()); + $this->renderingWithCustomisations($view, $view->getData()); + $this->renderingWithData($view, $view->getData()); + $this->renderingWithReordering($view, $view->getData()); + $this->renderingWithPagination($view, $view->getData()); + $this->render(); + + return $view; + } +} diff --git a/tests/Http/Livewire/BreedsTable.php b/tests/Http/Livewire/BreedsTable.php index 18a32995c..e9f8ac9ad 100644 --- a/tests/Http/Livewire/BreedsTable.php +++ b/tests/Http/Livewire/BreedsTable.php @@ -3,7 +3,6 @@ namespace Rappasoft\LaravelLivewireTables\Tests\Http\Livewire; use Illuminate\Database\Eloquent\Builder; -use Rappasoft\LaravelLivewireTables\DataTableComponent; use Rappasoft\LaravelLivewireTables\Tests\Models\Breed; use Rappasoft\LaravelLivewireTables\Tests\Models\Pet; use Rappasoft\LaravelLivewireTables\Tests\Models\Species; @@ -18,32 +17,10 @@ use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter; use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter; -class BreedsTable extends DataTableComponent +class BreedsTable extends BaseTable { public $model = Breed::class; - public string $paginationTest = 'standard'; - - public function enableDetailedPagination(string $type = 'standard') - { - $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3); - $this->setPaginationMethod($type); - $this->setDisplayPaginationDetailsEnabled(); - - } - - public function disableDetailedPagination(string $type = 'standard') - { - $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3); - $this->setPaginationMethod($type); - $this->setDisplayPaginationDetailsDisabled(); - } - - public function setPaginationTest(string $type) - { - $this->paginationTest = $type; - } - public function configure(): void { $this->setPrimaryKey('id'); diff --git a/tests/Http/Livewire/FailingTables/BrokenSecondaryHeaderTable.php b/tests/Http/Livewire/FailingTables/BrokenSecondaryHeaderTable.php index cbdf8a837..5e1aaddcb 100644 --- a/tests/Http/Livewire/FailingTables/BrokenSecondaryHeaderTable.php +++ b/tests/Http/Livewire/FailingTables/BrokenSecondaryHeaderTable.php @@ -4,37 +4,16 @@ use Illuminate\Database\Eloquent\Builder; use Rappasoft\LaravelLivewireTables\DataTableComponent; +use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BaseTable; use Rappasoft\LaravelLivewireTables\Tests\Models\{Breed,Pet,Species}; use Rappasoft\LaravelLivewireTables\Views\Column; use Rappasoft\LaravelLivewireTables\Views\Columns\{ImageColumn,LinkColumn}; use Rappasoft\LaravelLivewireTables\Views\Filters\{DateFilter,DateTimeFilter,MultiSelectDropdownFilter,MultiSelectFilter,NumberFilter,SelectFilter,TextFilter}; -class BrokenSecondaryHeaderTable extends DataTableComponent +class BrokenSecondaryHeaderTable extends BaseTable { public $model = Pet::class; - public string $paginationTest = 'standard'; - - public function enableDetailedPagination(string $type = 'standard') - { - $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3); - $this->setPaginationMethod($type); - $this->setDisplayPaginationDetailsEnabled(); - - } - - public function disableDetailedPagination(string $type = 'standard') - { - $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3); - $this->setPaginationMethod($type); - $this->setDisplayPaginationDetailsDisabled(); - } - - public function setPaginationTest(string $type) - { - $this->paginationTest = $type; - } - public function configure(): void { $this->setPrimaryKey('id'); diff --git a/tests/Http/Livewire/FailingTables/NoBuildMethodTable.php b/tests/Http/Livewire/FailingTables/NoBuildMethodTable.php index 273046ce4..9e5dd97b5 100644 --- a/tests/Http/Livewire/FailingTables/NoBuildMethodTable.php +++ b/tests/Http/Livewire/FailingTables/NoBuildMethodTable.php @@ -4,6 +4,7 @@ use Illuminate\Database\Eloquent\Builder; use Rappasoft\LaravelLivewireTables\DataTableComponent; +use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BaseTable; use Rappasoft\LaravelLivewireTables\Tests\Models\Breed; use Rappasoft\LaravelLivewireTables\Tests\Models\Species; use Rappasoft\LaravelLivewireTables\Views\Column; @@ -17,7 +18,7 @@ use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter; use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter; -class NoBuildMethodTable extends DataTableComponent +class NoBuildMethodTable extends BaseTable { public function configure(): void { diff --git a/tests/Http/Livewire/FailingTables/NoColumnsTable.php b/tests/Http/Livewire/FailingTables/NoColumnsTable.php index 380ba6824..ea76aaa7c 100644 --- a/tests/Http/Livewire/FailingTables/NoColumnsTable.php +++ b/tests/Http/Livewire/FailingTables/NoColumnsTable.php @@ -2,95 +2,16 @@ namespace Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\FailingTables; -use Illuminate\Database\Eloquent\Builder; -use Rappasoft\LaravelLivewireTables\DataTableComponent; -use Rappasoft\LaravelLivewireTables\Tests\Models\Breed; +use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable; use Rappasoft\LaravelLivewireTables\Tests\Models\Pet; -use Rappasoft\LaravelLivewireTables\Tests\Models\Species; -use Rappasoft\LaravelLivewireTables\Views\Filters\DateFilter; -use Rappasoft\LaravelLivewireTables\Views\Filters\DateTimeFilter; -use Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectDropdownFilter; -use Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectFilter; -use Rappasoft\LaravelLivewireTables\Views\Filters\NumberFilter; -use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter; -use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter; -class NoColumnsTable extends DataTableComponent +class NoColumnsTable extends PetsTable { public $model = Pet::class; - public function configure(): void - { - $this->setPrimaryKey('id'); - } - public function columns(): array { return [ ]; } - - public function filters(): array - { - return [ - MultiSelectFilter::make('Breed') - ->options( - Breed::query() - ->orderBy('name') - ->get() - ->keyBy('id') - ->map(fn ($breed) => $breed->name) - ->toArray() - ) - ->filter(function (Builder $builder, array $values) { - return $builder->whereIn('breed_id', $values); - }), - MultiSelectDropdownFilter::make('Species') - ->options( - Species::query() - ->orderBy('name') - ->get() - ->keyBy('id') - ->map(fn ($species) => $species->name) - ->toArray() - ) - ->filter(function (Builder $builder, array $values) { - return $builder->whereIn('species_id', $values); - }), - NumberFilter::make('Breed ID', 'breed_id_filter') - ->filter(function (Builder $builder, string $value) { - return $builder->where('breed_id', '=', $value); - }), - - TextFilter::make('Pet Name', 'pet_name_filter') - ->filter(function (Builder $builder, string $value) { - return $builder->where('pets.name', '=', $value); - }), - - DateFilter::make('Last Visit After Date', 'last_visit_date_filter') - ->filter(function (Builder $builder, string $value) { - return $builder->whereDate('pets.last_visit', '=>', $value); - }), - - DateTimeFilter::make('Last Visit Before DateTime', 'last_visit_datetime_filter') - ->filter(function (Builder $builder, string $value) { - return $builder->whereDate('pets.last_visit', '<=', $value); - }), - - SelectFilter::make('Breed SelectFilter', 'breed_select_filter') - ->options( - Breed::query() - ->orderBy('name') - ->get() - ->keyBy('id') - ->map(fn ($breed) => $breed->name) - ->toArray() - ) - ->filter(function (Builder $builder, string $value) { - return $builder->where('breed_id', $value); - }) - ->setCustomFilterLabel('livewire-tables::tests.testFilterLabel') - ->setFilterPillBlade('livewire-tables::tests.testFilterPills'), - ]; - } } diff --git a/tests/Http/Livewire/FailingTables/NoPrimaryKeyTable.php b/tests/Http/Livewire/FailingTables/NoPrimaryKeyTable.php index be6f0100c..02d05ed74 100644 --- a/tests/Http/Livewire/FailingTables/NoPrimaryKeyTable.php +++ b/tests/Http/Livewire/FailingTables/NoPrimaryKeyTable.php @@ -4,6 +4,7 @@ use Illuminate\Database\Eloquent\Builder; use Rappasoft\LaravelLivewireTables\DataTableComponent; +use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BaseTable; use Rappasoft\LaravelLivewireTables\Tests\Models\Breed; use Rappasoft\LaravelLivewireTables\Tests\Models\Pet; use Rappasoft\LaravelLivewireTables\Tests\Models\Species; @@ -18,7 +19,7 @@ use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter; use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter; -class NoPrimaryKeyTable extends DataTableComponent +class NoPrimaryKeyTable extends BaseTable { public $model = Pet::class; diff --git a/tests/Http/Livewire/PetsTable.php b/tests/Http/Livewire/PetsTable.php index 32024f7a5..9985f222b 100644 --- a/tests/Http/Livewire/PetsTable.php +++ b/tests/Http/Livewire/PetsTable.php @@ -5,7 +5,6 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Facades\App; use Livewire\Attributes\On; -use Rappasoft\LaravelLivewireTables\DataTableComponent; use Rappasoft\LaravelLivewireTables\Tests\Models\Breed; use Rappasoft\LaravelLivewireTables\Tests\Models\Pet; use Rappasoft\LaravelLivewireTables\Tests\Models\Species; @@ -20,37 +19,15 @@ use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter; use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter; -class PetsTable extends DataTableComponent +class PetsTable extends BaseTable { public $model = Pet::class; - public string $paginationTest = 'standard'; - public function changeLocale(string $locale) { App::setLocale($locale); } - public function enableDetailedPagination(string $type = 'standard') - { - $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3); - $this->setPaginationMethod($type); - $this->setDisplayPaginationDetailsEnabled(); - - } - - public function disableDetailedPagination(string $type = 'standard') - { - $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3); - $this->setPaginationMethod($type); - $this->setDisplayPaginationDetailsDisabled(); - } - - public function setPaginationTest(string $type) - { - $this->paginationTest = $type; - } - public function configure(): void { $this->setPrimaryKey('id'); diff --git a/tests/Http/Livewire/PetsTableCustomFilters.php b/tests/Http/Livewire/PetsTableCustomFilters.php index ef717c99d..8613b21c3 100644 --- a/tests/Http/Livewire/PetsTableCustomFilters.php +++ b/tests/Http/Livewire/PetsTableCustomFilters.php @@ -18,92 +18,8 @@ use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter; use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter; -class PetsTableCustomFilters extends DataTableComponent +class PetsTableCustomFilters extends PetsTable { - public $model = Pet::class; - - public string $paginationTest = 'standard'; - - public function enableDetailedPagination(string $type = 'standard') - { - $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3); - $this->setPaginationMethod($type); - $this->setDisplayPaginationDetailsEnabled(); - - } - - public function disableDetailedPagination(string $type = 'standard') - { - $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3); - $this->setPaginationMethod($type); - $this->setDisplayPaginationDetailsDisabled(); - } - - public function setPaginationTest(string $type) - { - $this->paginationTest = $type; - } - - public function configure(): void - { - $this->setPrimaryKey('id'); - } - - public function columns(): array - { - return [ - Column::make('ID', 'id') - ->sortable() - ->setSortingPillTitle('Key') - ->setSortingPillDirections('0-9', '9-0'), - Column::make('Sort') - ->sortable() - ->excludeFromColumnSelect(), - Column::make('Name') - ->sortable() - ->secondaryHeader($this->getFilterByKey('pet_name_filter')) - ->footerFilter('pet_name_filter') - ->searchable(), - - Column::make('Age'), - - Column::make('Breed', 'breed.name') - ->secondaryHeaderFilter('breed') - ->footer($this->getFilterByKey('breed')) - ->sortable( - fn (Builder $query, string $direction) => $query->orderBy('pets.id', $direction) - ) - ->searchable( - fn (Builder $query, $searchTerm) => $query->orWhere('breed.name', $searchTerm) - ), - - Column::make('Other') - ->label(function ($row, Column $column) { - return 'Other'; - }) - ->footer(function ($rows) { - return 'Count: '.$rows->count(); - }), - - LinkColumn::make('Link') - ->title(fn ($row) => 'Edit') - ->location(fn ($row) => 'http://www.google.com') - ->attributes(fn ($row) => [ - 'class' => 'rounded-full', - 'alt' => $row->name.' Avatar', - ]), - ImageColumn::make('RowImg') - ->location(fn ($row) => 'test'.$row->id) - ->attributes(fn ($row) => [ - 'class' => 'rounded-full', - 'alt' => $row->name.' Avatar', - ]), - Column::make('Last Visit', 'last_visit') - ->sortable() - ->deselected(), - ]; - } - public function filters(): array { return [ diff --git a/tests/Http/Livewire/PetsTableMount.php b/tests/Http/Livewire/PetsTableMount.php index 7021dfe7a..1d69e8066 100644 --- a/tests/Http/Livewire/PetsTableMount.php +++ b/tests/Http/Livewire/PetsTableMount.php @@ -18,10 +18,8 @@ use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter; use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter; -class PetsTableMount extends DataTableComponent +class PetsTableMount extends PetsTable { - public $model = Pet::class; - public ?int $mountBreed = null; public function mount(?int $mountBreed = null) @@ -31,130 +29,6 @@ public function mount(?int $mountBreed = null) } } - public function configure(): void - { - $this->setPrimaryKey('id'); - } - - public function columns(): array - { - return [ - Column::make('ID', 'id') - ->sortable() - ->setSortingPillTitle('Key') - ->setSortingPillDirections('0-9', '9-0'), - Column::make('Sort') - ->sortable() - ->excludeFromColumnSelect(), - Column::make('Name') - ->sortable() - ->secondaryHeader($this->getFilterByKey('pet_name_filter')) - ->footerFilter('pet_name_filter') - ->searchable(), - - Column::make('Age'), - - Column::make('Breed', 'breed.name') - ->secondaryHeaderFilter('breed') - ->footer($this->getFilterByKey('breed')) - ->sortable( - fn (Builder $query, string $direction) => $query->orderBy('pets.id', $direction) - ) - ->searchable( - fn (Builder $query, $searchTerm) => $query->orWhere('breed.name', $searchTerm) - ), - - Column::make('Other') - ->label(function ($row, Column $column) { - return 'Other'; - }) - ->footer(function ($rows) { - return 'Count: '.$rows->count(); - }), - - LinkColumn::make('Link') - ->title(fn ($row) => 'Edit') - ->location(fn ($row) => 'http://www.google.com') - ->attributes(fn ($row) => [ - 'class' => 'rounded-full', - 'alt' => $row->name.' Avatar', - ]), - ImageColumn::make('RowImg') - ->location(fn ($row) => 'test'.$row->id) - ->attributes(fn ($row) => [ - 'class' => 'rounded-full', - 'alt' => $row->name.' Avatar', - ]), - Column::make('Last Visit', 'last_visit') - ->sortable() - ->deselected(), - ]; - } - - public function filters(): array - { - return [ - MultiSelectFilter::make('Breed') - ->options( - Breed::query() - ->orderBy('name') - ->get() - ->keyBy('id') - ->map(fn ($breed) => $breed->name) - ->toArray() - ) - ->filter(function (Builder $builder, array $values) { - return $builder->whereIn('breed_id', $values); - }), - MultiSelectDropdownFilter::make('Species') - ->options( - Species::query() - ->orderBy('name') - ->get() - ->keyBy('id') - ->map(fn ($species) => $species->name) - ->toArray() - ) - ->filter(function (Builder $builder, array $values) { - return $builder->whereIn('species_id', $values); - }), - NumberFilter::make('Breed ID', 'breed_id_filter') - ->filter(function (Builder $builder, string $value) { - return $builder->where('breed_id', '=', $value); - }), - - TextFilter::make('Pet Name', 'pet_name_filter') - ->filter(function (Builder $builder, string $value) { - return $builder->where('pets.name', '=', $value); - }), - - DateFilter::make('Last Visit After Date', 'last_visit_date_filter') - ->filter(function (Builder $builder, string $value) { - return $builder->whereDate('pets.last_visit', '=>', $value); - }), - - DateTimeFilter::make('Last Visit Before DateTime', 'last_visit_datetime_filter') - ->filter(function (Builder $builder, string $value) { - return $builder->whereDate('pets.last_visit', '<=', $value); - }), - - SelectFilter::make('Breed SelectFilter', 'breed_select_filter') - ->options( - Breed::query() - ->orderBy('name') - ->get() - ->keyBy('id') - ->map(fn ($breed) => $breed->name) - ->toArray() - ) - ->filter(function (Builder $builder, string $value) { - return $builder->where('breed_id', $value); - }) - ->setCustomFilterLabel('livewire-tables::tests.testFilterLabel') - ->setFilterPillBlade('livewire-tables::tests.testFilterPills'), - ]; - } - public function builder(): Builder { if (isset($this->mountBreed)) { diff --git a/tests/Http/Livewire/PetsTableUnpaginated.php b/tests/Http/Livewire/PetsTableUnpaginated.php index 502b1f938..013b2e0ab 100644 --- a/tests/Http/Livewire/PetsTableUnpaginated.php +++ b/tests/Http/Livewire/PetsTableUnpaginated.php @@ -18,72 +18,8 @@ use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter; use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter; -class PetsTableUnpaginated extends DataTableComponent +class PetsTableUnpaginated extends PetsTable { - public $model = Pet::class; - - public string $paginationTest = 'standard'; - - public function configure(): void - { - $this->setPrimaryKey('id'); - } - - public function columns(): array - { - return [ - Column::make('ID', 'id') - ->sortable() - ->setSortingPillTitle('Key') - ->setSortingPillDirections('0-9', '9-0'), - Column::make('Sort') - ->sortable() - ->excludeFromColumnSelect(), - Column::make('Name') - ->sortable() - ->secondaryHeader($this->getFilterByKey('pet_name_filter')) - ->footerFilter('pet_name_filter') - ->searchable(), - - Column::make('Age'), - - Column::make('Breed', 'breed.name') - ->secondaryHeaderFilter('breed') - ->footer($this->getFilterByKey('breed')) - ->sortable( - fn (Builder $query, string $direction) => $query->orderBy('pets.id', $direction) - ) - ->searchable( - fn (Builder $query, $searchTerm) => $query->orWhere('breed.name', $searchTerm) - ), - - Column::make('Other') - ->label(function ($row, Column $column) { - return 'Other'; - }) - ->footer(function ($rows) { - return 'Count: '.$rows->count(); - }), - - LinkColumn::make('Link') - ->title(fn ($row) => 'Edit') - ->location(fn ($row) => 'http://www.google.com') - ->attributes(fn ($row) => [ - 'class' => 'rounded-full', - 'alt' => $row->name.' Avatar', - ]), - ImageColumn::make('RowImg') - ->location(fn ($row) => 'test'.$row->id) - ->attributes(fn ($row) => [ - 'class' => 'rounded-full', - 'alt' => $row->name.' Avatar', - ]), - Column::make('Last Visit', 'last_visit') - ->sortable() - ->deselected(), - ]; - } - public function filters(): array { return [ diff --git a/tests/Http/Livewire/PetsTableWithOwner.php b/tests/Http/Livewire/PetsTableWithOwner.php index fa8b6290d..0f07022dc 100644 --- a/tests/Http/Livewire/PetsTableWithOwner.php +++ b/tests/Http/Livewire/PetsTableWithOwner.php @@ -20,37 +20,8 @@ use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter; use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter; -class PetsTableWithOwner extends DataTableComponent +class PetsTableWithOwner extends PetsTable { - public $model = Pet::class; - - public string $paginationTest = 'standard'; - - public function enableDetailedPagination(string $type = 'standard') - { - $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3); - $this->setPaginationMethod($type); - $this->setDisplayPaginationDetailsEnabled(); - - } - - public function disableDetailedPagination(string $type = 'standard') - { - $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3); - $this->setPaginationMethod($type); - $this->setDisplayPaginationDetailsDisabled(); - } - - public function setPaginationTest(string $type) - { - $this->paginationTest = $type; - } - - public function configure(): void - { - $this->setPrimaryKey('id'); - } - public function columns(): array { return [ diff --git a/tests/Http/Livewire/SpeciesTable.php b/tests/Http/Livewire/SpeciesTable.php index 5e8c136a2..f5986ad20 100644 --- a/tests/Http/Livewire/SpeciesTable.php +++ b/tests/Http/Livewire/SpeciesTable.php @@ -2,12 +2,11 @@ namespace Rappasoft\LaravelLivewireTables\Tests\Http\Livewire; -use Rappasoft\LaravelLivewireTables\DataTableComponent; use Rappasoft\LaravelLivewireTables\Tests\Models\Species; use Rappasoft\LaravelLivewireTables\Views\Column; use Rappasoft\LaravelLivewireTables\Views\Columns\{AvgColumn,CountColumn,SumColumn}; -class SpeciesTable extends DataTableComponent +class SpeciesTable extends BaseTable { public $model = Species::class; diff --git a/tests/TestCase.php b/tests/TestCase.php index f80c08875..aba2a3bc6 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -96,101 +96,35 @@ protected function setupBasicTable() { $view = view('livewire-tables::datatable'); $this->basicTable = new PetsTable; - $this->basicTable->mountManagesFilters(); - $this->basicTable->boot(); - $this->basicTable->bootedManagesFilters(); - $this->basicTable->bootedComponentUtilities(); - $this->basicTable->bootedWithColumns(); - $this->basicTable->bootedWithColumnSelect(); - $this->basicTable->booted(); - $this->basicTable->renderingWithColumns($view, $view->getData()); - $this->basicTable->renderingWithColumnSelect($view, $view->getData()); - $this->basicTable->renderingWithCustomisations($view, $view->getData()); - $this->basicTable->renderingWithData($view, $view->getData()); - $this->basicTable->renderingWithReordering($view, $view->getData()); - $this->basicTable->renderingWithPagination($view, $view->getData()); - $this->basicTable->render(); + $this->basicTable->bootAll(); } protected function setupEventsTable() { $view = view('livewire-tables::datatable'); $this->eventsTable = new PetsTableEvents; - $this->eventsTable->mountManagesFilters(); - $this->eventsTable->boot(); - $this->eventsTable->bootedComponentUtilities(); - $this->eventsTable->bootedManagesFilters(); - $this->eventsTable->bootedWithColumns(); - $this->eventsTable->bootedWithColumnSelect(); - $this->eventsTable->booted(); - $this->eventsTable->renderingWithColumns($view, $view->getData()); - $this->eventsTable->renderingWithColumnSelect($view, $view->getData()); - $this->eventsTable->renderingWithCustomisations($view, $view->getData()); - $this->eventsTable->renderingWithData($view, $view->getData()); - $this->eventsTable->renderingWithReordering($view, $view->getData()); - $this->eventsTable->renderingWithPagination($view, $view->getData()); - - $this->eventsTable->render(); + $this->eventsTable->bootAll(); } protected function setupBreedsTable() { $view = view('livewire-tables::datatable'); $this->breedsTable = new BreedsTable; - $this->breedsTable->mountManagesFilters(); - $this->breedsTable->boot(); - $this->breedsTable->bootedComponentUtilities(); - $this->breedsTable->bootedManagesFilters(); - $this->breedsTable->bootedWithColumns(); - $this->breedsTable->bootedWithColumnSelect(); - $this->breedsTable->booted(); - $this->breedsTable->renderingWithColumns($view, $view->getData()); - $this->breedsTable->renderingWithColumnSelect($view, $view->getData()); - $this->breedsTable->renderingWithCustomisations($view, $view->getData()); - $this->breedsTable->renderingWithData($view, $view->getData()); - $this->breedsTable->renderingWithReordering($view, $view->getData()); - $this->breedsTable->renderingWithPagination($view, $view->getData()); - $this->breedsTable->render(); + $this->breedsTable->bootAll(); } protected function setupPetOwnerTable() { $view = view('livewire-tables::datatable'); $this->petOwnerTable = new PetsTableWithOwner; - $this->petOwnerTable->mountManagesFilters(); - $this->petOwnerTable->boot(); - $this->petOwnerTable->bootedComponentUtilities(); - $this->petOwnerTable->bootedManagesFilters(); - $this->petOwnerTable->bootedWithColumns(); - $this->petOwnerTable->bootedWithColumnSelect(); - $this->petOwnerTable->booted(); - $this->petOwnerTable->renderingWithColumns($view, $view->getData()); - $this->petOwnerTable->renderingWithColumnSelect($view, $view->getData()); - $this->petOwnerTable->renderingWithCustomisations($view, $view->getData()); - $this->petOwnerTable->renderingWithData($view, $view->getData()); - $this->petOwnerTable->renderingWithReordering($view, $view->getData()); - $this->petOwnerTable->renderingWithPagination($view, $view->getData()); - $this->petOwnerTable->render(); + $this->petOwnerTable->bootAll(); } protected function setupSpeciesTable() { $view = view('livewire-tables::datatable'); $this->speciesTable = new SpeciesTable; - $this->speciesTable->mountManagesFilters(); - $this->speciesTable->boot(); - $this->speciesTable->bootedComponentUtilities(); - $this->speciesTable->bootedManagesFilters(); - $this->speciesTable->bootedWithColumns(); - $this->speciesTable->bootedWithColumnSelect(); - $this->speciesTable->booted(); - $this->speciesTable->renderingWithColumns($view, $view->getData()); - $this->speciesTable->renderingWithColumnSelect($view, $view->getData()); - $this->speciesTable->renderingWithCustomisations($view, $view->getData()); - $this->speciesTable->renderingWithData($view, $view->getData()); - $this->speciesTable->renderingWithReordering($view, $view->getData()); - $this->speciesTable->renderingWithPagination($view, $view->getData()); - $this->speciesTable->render(); + $this->speciesTable->bootAll(); } protected function setupUnpaginatedTable() @@ -198,20 +132,7 @@ protected function setupUnpaginatedTable() $view = view('livewire-tables::datatable'); $this->unpaginatedTable = new PetsTableUnpaginated; - $this->unpaginatedTable->mountManagesFilters(); - $this->unpaginatedTable->boot(); - $this->unpaginatedTable->bootedComponentUtilities(); - $this->unpaginatedTable->bootedManagesFilters(); - $this->unpaginatedTable->bootedWithColumns(); - $this->unpaginatedTable->bootedWithColumnSelect(); - $this->unpaginatedTable->booted(); - $this->unpaginatedTable->renderingWithColumns($view, $view->getData()); - $this->unpaginatedTable->renderingWithColumnSelect($view, $view->getData()); - $this->unpaginatedTable->renderingWithCustomisations($view, $view->getData()); - $this->unpaginatedTable->renderingWithData($view, $view->getData()); - $this->unpaginatedTable->renderingWithReordering($view, $view->getData()); - $this->unpaginatedTable->renderingWithPagination($view, $view->getData()); - $this->unpaginatedTable->render(); + $this->unpaginatedTable->bootAll(); } diff --git a/tests/DataTableComponentTest.php b/tests/Unit/DataTableComponentTest.php similarity index 96% rename from tests/DataTableComponentTest.php rename to tests/Unit/DataTableComponentTest.php index 15831df4e..46502d83d 100644 --- a/tests/DataTableComponentTest.php +++ b/tests/Unit/DataTableComponentTest.php @@ -1,10 +1,11 @@ setDataTableFingerprint('test'); - } - public function pubSetSearchFieldAttributes(array $attributes) { $this->setSearchFieldAttributes($attributes); } }; - $mock->configure(); - $mock->boot(); + $mock->bootAll(); $this->assertSame(['default' => true, 'default-colors' => true, 'default-styling' => true], $mock->getSearchFieldAttributes()); @@ -213,11 +207,6 @@ public function test_can_set_search_icon(): void { public ?array $testAttributesArray; - public function configure(): void - { - $this->setDataTableFingerprint('test'); - } - public function pubSetSearchFieldAttributes(array $attributes) { $this->setSearchFieldAttributes($attributes); @@ -234,8 +223,7 @@ public function pubSetSearchIconAttributes(array $attributes) } }; - $mock->configure(); - $mock->boot(); + $mock->bootAll(); $this->assertFalse($mock->hasSearchIcon()); $mock->pubSetSearchIcon('heroicon-m-magnifying-glass-2'); @@ -251,11 +239,6 @@ public function test_can_set_search_icon_status(): void { public ?array $testAttributesArray; - public function configure(): void - { - $this->setDataTableFingerprint('test'); - } - public function pubSetSearchFieldAttributes(array $attributes) { $this->setSearchFieldAttributes($attributes); @@ -272,8 +255,7 @@ public function pubSetSearchIconDisabled() } }; - $mock->configure(); - $mock->boot(); + $mock->bootAll(); $this->assertFalse($mock->hasSearchIcon()); $mock->pubSetSearchIconEnabled(); @@ -290,12 +272,6 @@ public function test_can_set_search_icon_attributes(): void { public ?array $testAttributesArray; - public function configure(): void - { - $this->setDataTableFingerprint('test'); - - } - public function pubSetSearchFieldAttributes(array $attributes) { $this->setSearchFieldAttributes($attributes); @@ -312,8 +288,7 @@ public function pubSetSearchIconAttributes(array $attributes) } }; - $mock->configure(); - $mock->boot(); + $mock->bootAll(); $this->assertSame('h-4 w-4', $mock->getSearchIconClasses()); $this->assertSame([ diff --git a/tests/Unit/Traits/Configuration/SortingConfigurationTest.php b/tests/Unit/Traits/Configuration/SortingConfigurationTest.php index 9bbe071b4..2664f60d4 100644 --- a/tests/Unit/Traits/Configuration/SortingConfigurationTest.php +++ b/tests/Unit/Traits/Configuration/SortingConfigurationTest.php @@ -105,25 +105,6 @@ public function configure(): void $this->setDefaultSort('name', 'desc'); } }; - $viewDesc = view('livewire-tables::datatable'); - - $tempDesc->boot(); - $tempDesc->bootedComponentUtilities(); - $tempDesc->bootedManagesFilters(); - $tempDesc->bootedWithColumns(); - $tempDesc->bootedWithColumnSelect(); - $tempDesc->booted(); - $tempDesc->mountManagesFilters(); - $tempDesc->mountWithSorting(); - $tempDesc->renderingWithColumns($viewDesc, $viewDesc->getData()); - $tempDesc->renderingWithColumnSelect($viewDesc, $viewDesc->getData()); - $tempDesc->renderingWithCustomisations($viewDesc, $viewDesc->getData()); - $tempDesc->renderingWithData($viewDesc, $viewDesc->getData()); - $tempDesc->renderingWithReordering($viewDesc, $viewDesc->getData()); - $tempDesc->renderingWithPagination($viewDesc, $viewDesc->getData()); - $tempDesc->render(); - $this->assertSame(['name' => 'desc'], $tempDesc->getSorts()); - $this->assertSame('desc', $tempDesc->getSort('name')); $tempAsc = new class extends PetsTable { @@ -134,22 +115,17 @@ public function configure(): void $this->setDefaultSort('name', 'asc'); } }; + + $viewDesc = view('livewire-tables::datatable'); + $tempDesc->bootAll(); + $tempDesc->renderAll($viewDesc); $viewAsc = view('livewire-tables::datatable'); - $tempAsc->boot(); - $tempAsc->bootedComponentUtilities(); - $tempAsc->bootedManagesFilters(); - $tempAsc->bootedWithColumns(); - $tempAsc->bootedWithColumnSelect(); - $tempAsc->booted(); - $tempAsc->mountManagesFilters(); - $tempAsc->mountWithSorting(); - $tempAsc->renderingWithColumns($viewAsc, $viewAsc->getData()); - $tempAsc->renderingWithColumnSelect($viewAsc, $viewAsc->getData()); - $tempAsc->renderingWithCustomisations($viewAsc, $viewAsc->getData()); - $tempAsc->renderingWithData($viewAsc, $viewAsc->getData()); - $tempAsc->renderingWithReordering($viewAsc, $viewAsc->getData()); - $tempAsc->renderingWithPagination($viewAsc, $viewAsc->getData()); - $tempAsc->render(); + $tempAsc->bootAll(); + $tempAsc->renderAll($viewAsc); + + $this->assertSame(['name' => 'desc'], $tempDesc->getSorts()); + $this->assertSame('desc', $tempDesc->getSort('name')); + $this->assertSame(['name' => 'asc'], $tempAsc->getSorts()); $this->assertSame('asc', $tempAsc->getSort('name')); diff --git a/tests/Unit/Traits/Core/CustomAttributesTest.php b/tests/Unit/Traits/Core/CustomAttributesTest.php index 0f76c067d..3966a8dad 100644 --- a/tests/Unit/Traits/Core/CustomAttributesTest.php +++ b/tests/Unit/Traits/Core/CustomAttributesTest.php @@ -17,12 +17,12 @@ public function test_can_get_custom_attribute_defaults_false_standard_mode(): vo public function configure(): void { + $this->setPrimaryKey('id'); $this->setDataTableFingerprint('test'); } }; - $mock->configure(); - $mock->boot(); + $mock->bootAll(); $this->assertSame([ 'default' => false, @@ -39,12 +39,13 @@ public function test_can_get_custom_attribute_defaults_false_classic_mode(): voi public function configure(): void { + $this->setPrimaryKey('id'); + $this->setDataTableFingerprint('test'); } }; - $mock->configure(); - $mock->boot(); + $mock->bootAll(); $this->assertSame([ 'default-colors' => false, @@ -60,12 +61,13 @@ public function test_can_get_custom_attribute_defaults_true_standard_mode(): voi public function configure(): void { + $this->setPrimaryKey('id'); + $this->setDataTableFingerprint('test'); } }; - $mock->configure(); - $mock->boot(); + $mock->bootAll(); $this->assertSame([ 'default' => true, @@ -82,12 +84,13 @@ public function test_can_get_custom_attribute_defaults_true_classic_mode(): void public function configure(): void { + $this->setPrimaryKey('id'); + $this->setDataTableFingerprint('test'); } }; - $mock->configure(); - $mock->boot(); + $mock->bootAll(); $this->assertSame([ 'default-colors' => true, diff --git a/tests/Unit/Traits/Core/Filters/FilterStatusTest.php b/tests/Unit/Traits/Core/Filters/FilterStatusTest.php index 9021a0a1b..7c72a2d7f 100644 --- a/tests/Unit/Traits/Core/Filters/FilterStatusTest.php +++ b/tests/Unit/Traits/Core/Filters/FilterStatusTest.php @@ -36,8 +36,7 @@ public function setFiltersToDisabled() } }; - $mock->configure(); - $mock->boot(); + $mock->bootAll(); $this->assertTrue($mock->filtersAreEnabled()); $this->assertFalse($mock->filtersAreDisabled()); @@ -71,8 +70,7 @@ public function setFiltersToDisabled() } }; - $mock->configure(); - $mock->boot(); + $mock->bootAll(); $this->assertTrue($mock->filtersAreDisabled()); $this->assertFalse($mock->filtersAreEnabled()); diff --git a/tests/Unit/Traits/Helpers/ColumnHelpersTest.php b/tests/Unit/Traits/Helpers/ColumnHelpersTest.php index e1e2fd5e6..793d639e2 100644 --- a/tests/Unit/Traits/Helpers/ColumnHelpersTest.php +++ b/tests/Unit/Traits/Helpers/ColumnHelpersTest.php @@ -192,14 +192,7 @@ public function columns(): array return []; } }; - $testTable->mountManagesFilters(); - $testTable->configure(); - $testTable->boot(); - $testTable->bootedComponentUtilities(); - $testTable->bootedManagesFilters(); - $testTable->bootedWithColumns(); - $testTable->bootedWithColumnSelect(); - $testTable->booted(); + $testTable->bootAll(); } } diff --git a/tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php b/tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php index 581dce5f2..87ecf605b 100644 --- a/tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php +++ b/tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php @@ -118,14 +118,7 @@ public function configure(): void parent::configure(); } }; - $testTable->mountManagesFilters(); - $testTable->configure(); - $testTable->boot(); - $testTable->bootedManagesFilters(); - $testTable->bootedComponentUtilities(); - $testTable->bootedWithColumns(); - $testTable->bootedWithColumnSelect(); - $testTable->booted(); + $testTable->bootAll(); $this->assertSame(['id', 'sort', 'name', 'age', 'breed', 'other', 'link', 'rowimg'], $testTable->selectedColumns); @@ -156,14 +149,7 @@ public function configure(): void $this->enableColumnSelectEvent(); } }; - $testTable->mountManagesFilters(); - $testTable->configure(); - $testTable->boot(); - $testTable->bootedComponentUtilities(); - $testTable->bootedManagesFilters(); - $testTable->bootedWithColumns(); - $testTable->bootedWithColumnSelect(); - $testTable->booted(); + $testTable->bootAll(); $this->assertSame(['id', 'sort', 'name', 'age', 'breed', 'other', 'link', 'rowimg'], $testTable->selectedColumns); @@ -186,14 +172,7 @@ public function configure(): void $this->disableColumnSelectEvent(); } }; - $testTable->mountManagesFilters(); - $testTable->configure(); - $testTable->boot(); - $testTable->bootedManagesFilters(); - $testTable->bootedComponentUtilities(); - $testTable->bootedWithColumns(); - $testTable->bootedWithColumnSelect(); - $testTable->booted(); + $testTable->bootAll(); $this->assertSame(['id', 'sort', 'name', 'age', 'breed', 'other', 'link', 'rowimg'], $testTable->selectedColumns); $testTable->selectedColumns = ['id', 'sort', 'name', 'age', 'breed', 'other', 'rowimg']; diff --git a/tests/Unit/Traits/Helpers/FilterHelpersTest.php b/tests/Unit/Traits/Helpers/FilterHelpersTest.php index 907624d30..b9104cbd0 100644 --- a/tests/Unit/Traits/Helpers/FilterHelpersTest.php +++ b/tests/Unit/Traits/Helpers/FilterHelpersTest.php @@ -224,15 +224,7 @@ public function configure(): void parent::configure(); } }; - $testTable->mountManagesFilters(); - - $testTable->configure(); - $testTable->boot(); - $testTable->bootedManagesFilters(); - $testTable->bootedComponentUtilities(); - $testTable->bootedWithColumns(); - $testTable->bootedWithColumnSelect(); - $testTable->booted(); + $testTable->bootAll(); $testTable->setFilter('breed_id_filter', '2'); $testTable->updatedFilterComponents('2', 'breed_id_filter'); diff --git a/tests/Unit/Traits/Helpers/QueryStringHelpersTest.php b/tests/Unit/Traits/Helpers/QueryStringHelpersTest.php index 884094bac..8725e0c1a 100644 --- a/tests/Unit/Traits/Helpers/QueryStringHelpersTest.php +++ b/tests/Unit/Traits/Helpers/QueryStringHelpersTest.php @@ -24,14 +24,7 @@ public function getCurrentQueryStringBinding(): array } }; - $testTableQueryString->mountManagesFilters(); - $testTableQueryString->configure(); - $testTableQueryString->boot(); - $testTableQueryString->bootedComponentUtilities(); - $testTableQueryString->bootedManagesFilters(); - $testTableQueryString->bootedWithColumns(); - $testTableQueryString->bootedWithColumnSelect(); - $testTableQueryString->booted(); + $testTableQueryString->bootAll(); $this->assertSame([], $testTableQueryString->getCurrentQueryStringBinding()); @@ -54,14 +47,7 @@ public function getCurrentQueryStringBinding(): array } }; - $testTableQueryString->mountManagesFilters(); - $testTableQueryString->configure(); - $testTableQueryString->boot(); - $testTableQueryString->bootedComponentUtilities(); - $testTableQueryString->bootedManagesFilters(); - $testTableQueryString->bootedWithColumns(); - $testTableQueryString->bootedWithColumnSelect(); - $testTableQueryString->booted(); + $testTableQueryString->bootAll(); $this->assertSame(['table' => ['except' => null, 'history' => false, 'keep' => false, 'as' => 'table']], $testTableQueryString->getCurrentQueryStringBinding()); @@ -84,14 +70,7 @@ public function getCurrentQueryStringBinding(): array } }; - $testTableQueryString->mountManagesFilters(); - $testTableQueryString->configure(); - $testTableQueryString->boot(); - $testTableQueryString->bootedComponentUtilities(); - $testTableQueryString->bootedManagesFilters(); - $testTableQueryString->bootedWithColumns(); - $testTableQueryString->bootedWithColumnSelect(); - $testTableQueryString->booted(); + $testTableQueryString->bootAll(); $this->assertFalse($testTableQueryString->hasQueryStringAlias()); $this->assertSame('table', $testTableQueryString->getQueryStringAlias()); diff --git a/tests/Unit/Traits/WithColumnsTest.php b/tests/Unit/Traits/WithColumnsTest.php index 14de629cd..c53753500 100644 --- a/tests/Unit/Traits/WithColumnsTest.php +++ b/tests/Unit/Traits/WithColumnsTest.php @@ -22,20 +22,9 @@ public function configure(): void $view = view('livewire-tables::datatable'); - $testTableDefault->boot(); - $testTableDefault->mountManagesFilters(); - $testTableDefault->bootedComponentUtilities(); - $testTableDefault->bootedManagesFilters(); - $testTableDefault->bootedWithColumns(); - $testTableDefault->bootedWithColumnSelect(); - $testTableDefault->booted(); - $testTableDefault->renderingWithColumns($view, $view->getData()); - $testTableDefault->renderingWithColumnSelect($view, $view->getData()); - $testTableDefault->renderingWithCustomisations($view, $view->getData()); - $testTableDefault->renderingWithData($view, $view->getData()); - $testTableDefault->renderingWithReordering($view, $view->getData()); - $testTableDefault->renderingWithPagination($view, $view->getData()); - $testTableDefault->render(); + $testTableDefault->bootAll(); + $view = $testTableDefault->renderAll(); + $this->assertSame(9, $view->getData()['columns']->count()); } } diff --git a/tests/Unit/Traits/WithCustomisationsTest.php b/tests/Unit/Traits/WithCustomisationsTest.php index 036840a01..3c54fcd4f 100644 --- a/tests/Unit/Traits/WithCustomisationsTest.php +++ b/tests/Unit/Traits/WithCustomisationsTest.php @@ -22,20 +22,9 @@ public function configure(): void }; $view = view('livewire-tables::datatable'); - $temp->mountManagesFilters(); - $temp->boot(); - $temp->bootedComponentUtilities(); - $temp->bootedManagesFilters(); - $temp->bootedWithColumns(); - $temp->bootedWithColumnSelect(); - $temp->booted(); - $temp->renderingWithColumns($view, $view->getData()); - $temp->renderingWithColumnSelect($view, $view->getData()); - $temp->renderingWithCustomisations($view, $view->getData()); - $temp->renderingWithData($view, $view->getData()); - $temp->renderingWithReordering($view, $view->getData()); - $temp->renderingWithPagination($view, $view->getData()); - $temp->render(); + $temp->bootAll(); + $view = $temp->renderAll(); + $layoutConfig = $view->getData()['layoutConfig']; $this->assertSame($temp->getLayout(), $layoutConfig->view); @@ -55,20 +44,9 @@ public function configure(): void }; $view = view('livewire-tables::datatable'); - $temp->mountManagesFilters(); - $temp->boot(); - $temp->bootedComponentUtilities(); - $temp->bootedManagesFilters(); - $temp->bootedWithColumns(); - $temp->bootedWithColumnSelect(); - $temp->booted(); - $temp->renderingWithColumns($view, $view->getData()); - $temp->renderingWithColumnSelect($view, $view->getData()); - $temp->renderingWithCustomisations($view, $view->getData()); - $temp->renderingWithData($view, $view->getData()); - $temp->renderingWithReordering($view, $view->getData()); - $temp->renderingWithPagination($view, $view->getData()); - $temp->render(); + $temp->bootAll(); + $view = $temp->renderAll(); + $layoutConfig = $view->getData()['layoutConfig']; $this->assertSame($temp->getSection(), $layoutConfig->slotOrSection); @@ -88,20 +66,8 @@ public function configure(): void }; $view = view('livewire-tables::datatable'); - $temp->mountManagesFilters(); - $temp->boot(); - $temp->bootedComponentUtilities(); - $temp->bootedManagesFilters(); - $temp->bootedWithColumns(); - $temp->bootedWithColumnSelect(); - $temp->booted(); - $temp->renderingWithColumns($view, $view->getData()); - $temp->renderingWithColumnSelect($view, $view->getData()); - $temp->renderingWithCustomisations($view, $view->getData()); - $temp->renderingWithData($view, $view->getData()); - $temp->renderingWithReordering($view, $view->getData()); - $temp->renderingWithPagination($view, $view->getData()); - $temp->render(); + $temp->bootAll(); + $view = $temp->renderAll(); $layoutConfig = $view->getData()['layoutConfig']; $this->assertSame($temp->getSlot(), $layoutConfig->slotOrSection); @@ -121,18 +87,8 @@ public function configure(): void }; $view = view('livewire-tables::datatable'); - $temp->boot(); - $temp->bootedComponentUtilities(); - $temp->bootedWithColumns(); - $temp->bootedWithColumnSelect(); - $temp->booted(); - $temp->renderingWithColumns($view, $view->getData()); - $temp->renderingWithColumnSelect($view, $view->getData()); - $temp->renderingWithCustomisations($view, $view->getData()); - $temp->renderingWithData($view, $view->getData()); - $temp->renderingWithReordering($view, $view->getData()); - $temp->renderingWithPagination($view, $view->getData()); - $temp->render(); + $temp->bootAll(); + $view = $temp->renderAll(); $layoutConfig = $view->getData()['layoutConfig']; $this->assertSame('extends', $layoutConfig->type); $this->assertSame($temp->getExtends(), $layoutConfig->view); diff --git a/tests/Unit/Traits/WithSearchTest.php b/tests/Unit/Traits/WithSearchTest.php index e014c5eb3..9342c21c2 100644 --- a/tests/Unit/Traits/WithSearchTest.php +++ b/tests/Unit/Traits/WithSearchTest.php @@ -49,14 +49,7 @@ public function configure(): void } }; - $testTableDefault->mountManagesFilters(); - $testTableDefault->configure(); - $testTableDefault->boot(); - $testTableDefault->bootedComponentUtilities(); - $testTableDefault->bootedManagesFilters(); - $testTableDefault->bootedWithColumns(); - $testTableDefault->bootedWithColumnSelect(); - $testTableDefault->booted(); + $testTableDefault->bootAll(); $this->assertSame('', $testTableDefault->search); @@ -89,14 +82,7 @@ public function configure(): void } }; - $testTableTrimSearch->mountManagesFilters(); - $testTableTrimSearch->configure(); - $testTableTrimSearch->boot(); - $testTableTrimSearch->bootedComponentUtilities(); - $testTableTrimSearch->bootedManagesFilters(); - $testTableTrimSearch->bootedWithColumns(); - $testTableTrimSearch->bootedWithColumnSelect(); - $testTableTrimSearch->booted(); + $testTableTrimSearch->bootAll(); $this->assertSame('', $testTableTrimSearch->search);