Skip to content

Commit

Permalink
Merge branch '10.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
@crynobone
crynobone committed Jul 30, 2024
2 parents a83843e + 6dc2c3a commit b6f5d97
Show file tree
Hide file tree
Showing 13 changed files with 2,210 additions and 9,716 deletions.
2 changes: 1 addition & 1 deletion app/Nova/Post.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public function actions(NovaRequest $request): array
public function filters(NovaRequest $request): array
{
return [
new Filters\SelectFirst('user_id'),
Filters\SelectFirst::make('user_id')->searchable(uses_searchable()),
new Filters\UserPost,
];
}
Expand Down
11,767 changes: 2,095 additions & 9,672 deletions package-lock.json
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "laravel-nova-dusk-suite",
"private": true,
"scripts": {
"dev": "npm run development",
Expand All @@ -25,4 +26,4 @@
"tailwindcss": "^2.0.2",
"vue-loader": "^16.8.3"
}
}
}
2 changes: 1 addition & 1 deletion public/css/app.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/app.js
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions tests/Browser/CreateWithInlineRelationButtonTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ public function test_searchable_belongs_to_resource_can_be_cancelled_and_use_dif
->resetSearchResult()
->assertSearchResult(function ($browser, $attribute) {
$browser->assertSeeIn("{$attribute}-results", 'Ship name')
->assertPresent("{$attribute}-result-1")
->assertPresent("{$attribute}-result-2")
->assertPresent("{$attribute}-result-3")
->assertPresent("{$attribute}-result-4");
->assertNotPresent("{$attribute}-result-1")
->assertNotPresent("{$attribute}-result-2")
->assertNotPresent("{$attribute}-result-3")
->assertNotPresent("{$attribute}-result-4");
});
});
});
Expand Down
12 changes: 6 additions & 6 deletions tests/Browser/FilterableBelongsToManyFieldTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function test_it_can_filter_belongs_to_many_field()
->assertSeeResource(3)
->assertSeeResource(4)
->runFilter(function ($browser) {
$browser->whenAvailable('@giftBooks-default-belongs-to-many-field-filter', function ($browser) {
$browser->whenAvailable('@giftBooks-eloquent-field-filter', function ($browser) {
$browser->select('', 4)->pause(1000);
});
})->waitForTable()
Expand All @@ -43,7 +43,7 @@ public function test_it_can_filter_belongs_to_many_field()
->assertDontSeeResource(3)
->assertDontSeeResource(4)
->runFilter(function ($browser) {
$browser->whenAvailable('@giftBooks-default-belongs-to-many-field-filter', function ($browser) {
$browser->whenAvailable('@giftBooks-eloquent-field-filter', function ($browser) {
$browser->select('', 3)->pause(1000);
});
})->waitForTable()
Expand Down Expand Up @@ -76,7 +76,7 @@ public function test_it_can_filter_belongs_to_many_field_via_relationship()
->assertSeeResource(3, 3)
->assertDontSeeResource(4, 4)
->runFilter(function ($browser) {
$browser->whenAvailable('@giftBooks-default-belongs-to-many-field-filter', function ($browser) {
$browser->whenAvailable('@giftBooks-eloquent-field-filter', function ($browser) {
$browser->select('', 4)->pause(1000);
});
})
Expand All @@ -90,7 +90,7 @@ public function test_it_can_filter_belongs_to_many_field_via_relationship()
->assertDontSeeResource(3, 3)
->assertDontSeeResource(4, 4)
->runFilter(function ($browser) {
$browser->whenAvailable('@giftBooks-default-belongs-to-many-field-filter', function ($browser) {
$browser->whenAvailable('@giftBooks-eloquent-field-filter', function ($browser) {
$browser->select('', 3)->pause(1000);
});
})->waitForTable()
Expand Down Expand Up @@ -131,7 +131,7 @@ public function test_it_can_filter_belongs_to_many_field_via_nested_relationship
->assertSeeResource($ship1->getKey())
->assertSeeResource($ship2->getKey())
->runFilter(function ($browser) use ($captain) {
$browser->whenAvailable('@captains-default-belongs-to-many-field-filter', function ($browser) use ($captain) {
$browser->whenAvailable('@captains-eloquent-field-filter', function ($browser) use ($captain) {
$browser->select('', $captain->getKey())->pause(1000);
});
})->waitForTable()
Expand All @@ -143,7 +143,7 @@ public function test_it_can_filter_belongs_to_many_field_via_nested_relationship
->assertDontSeeResource($ship1->getKey())
->assertDontSeeResource($ship2->getKey())
->runFilter(function ($browser) use ($captain1) {
$browser->whenAvailable('@captains-default-belongs-to-many-field-filter', function ($browser) use ($captain1) {
$browser->whenAvailable('@captains-eloquent-field-filter', function ($browser) use ($captain1) {
$browser->select('', $captain1->getKey())->pause(1000);
});
})->waitForTable()
Expand Down
16 changes: 8 additions & 8 deletions tests/Browser/FilterableDateFieldTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ public function test_it_can_filter_by_date_field()
->within(new IndexComponent('people'), function (Browser $browser) use ($date, $people, $people1) {
$browser->waitForTable()
->runFilter(function ($browser) use ($date) {
$browser->typeOnDate('@date_of_birth-default-date-field-range-start', $date)
->typeOnDate('@date_of_birth-default-date-field-range-end', $date->addDay(1));
$browser->typeOnDate('@date_of_birth-date-field-filter-range-start', $date)
->typeOnDate('@date_of_birth-date-field-filter-range-end', $date->addDay(1));
})
->waitForTable();

Expand All @@ -45,8 +45,8 @@ public function test_it_can_filter_by_date_field()
->within(new IndexComponent('people'), function (Browser $browser) use ($date1, $people, $people1) {
$browser->waitForTable()
->runFilter(function ($browser) use ($date1) {
$browser->typeOnDate('@date_of_birth-default-date-field-range-start', $date1)
->typeOnDate('@date_of_birth-default-date-field-range-end', $date1->addDay(1));
$browser->typeOnDate('@date_of_birth-date-field-filter-range-start', $date1)
->typeOnDate('@date_of_birth-date-field-filter-range-end', $date1->addDay(1));
})
->waitForTable();

Expand Down Expand Up @@ -78,8 +78,8 @@ public function test_it_can_filter_by_datetime_field()
->within(new IndexComponent('people'), function (Browser $browser) use ($date, $people, $people1) {
$browser->waitForTable()
->runFilter(function ($browser) use ($date) {
$browser->typeInDateTimeField('@created_at-default-date-time-field-range-start', $date)
->typeInDateTimeField('@created_at-default-date-time-field-range-end', $date->addDay());
$browser->typeInDateTimeField('@created_at-date-time-field-filter-range-start', $date)
->typeInDateTimeField('@created_at-date-time-field-filter-range-end', $date->addDay());
}, function ($browser) {
$browser->waitForTable();
$browser->closeCurrentDropdown();
Expand All @@ -96,8 +96,8 @@ public function test_it_can_filter_by_datetime_field()
->within(new IndexComponent('people'), function (Browser $browser) use ($date1, $people, $people1) {
$browser->waitForTable()
->runFilter(function ($browser) use ($date1) {
$browser->typeInDateTimeField('@created_at-default-date-time-field-range-start', $date1)
->typeInDateTimeField('@created_at-default-date-time-field-range-end',
$browser->typeInDateTimeField('@created_at-date-time-field-filter-range-start', $date1)
->typeInDateTimeField('@created_at-date-time-field-filter-range-end',
$date1->addDay(1));
}, function ($browser) {
$browser->waitForTable();
Expand Down
36 changes: 18 additions & 18 deletions tests/Browser/FilterableFieldTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function test_it_can_filter_boolean_field()
->assertSeeResource(3)
->assertSeeResource(4)
->runFilter(function ($browser) {
$browser->click('@active-default-boolean-field-filter');
$browser->click('@active-boolean-field-filter');
})
->waitForTable()
// ->pause(50000)
Expand All @@ -41,7 +41,7 @@ public function test_it_can_filter_boolean_field()
->assertDontSeeResource(3)
->assertSeeResource(4)
->runFilter(function ($browser) {
$browser->click('@active-default-boolean-field-filter');
$browser->click('@active-boolean-field-filter');
})
->waitForTable()
->assertFilterCount(1)
Expand All @@ -51,7 +51,7 @@ public function test_it_can_filter_boolean_field()
->assertDontSeeResource(4)

->runFilter(function ($browser) {
$browser->click('@active-default-boolean-field-filter');
$browser->click('@active-boolean-field-filter');
})
->waitForTable()
->assertFilterCount(0)
Expand All @@ -76,7 +76,7 @@ public function test_it_can_filter_belongs_to_field()
->within(new IndexComponent('posts'), function ($browser) {
$browser->waitForTable()
->runFilter(function ($browser) {
$browser->whenAvailable('select[dusk="user-default-belongs-to-field-filter"]', function ($browser) {
$browser->whenAvailable('select[dusk="user-belongs-to-field-filter"]', function ($browser) {
$browser->select('', 1)->pause(1000);
});
})
Expand All @@ -89,7 +89,7 @@ public function test_it_can_filter_belongs_to_field()
->assertDontSeeResource(5);

$browser->runFilter(function ($browser) {
$browser->select('select[dusk="user-default-belongs-to-field-filter"]', 2)->pause(1000);
$browser->select('select[dusk="user-belongs-to-field-filter"]', 2)->pause(1000);
})
->waitForTable()
->assertFilterCount(1)
Expand All @@ -100,7 +100,7 @@ public function test_it_can_filter_belongs_to_field()
->assertSeeResource(5);

$browser->runFilter(function ($browser) {
$browser->select('select[dusk="user-default-belongs-to-field-filter"]', '')->pause(1000);
$browser->select('select[dusk="user-belongs-to-field-filter"]', '')->pause(1000);
})
->waitForTable()
->assertFilterCount(0)
Expand Down Expand Up @@ -133,7 +133,7 @@ public function test_it_can_filter_morph_to_field()
->assertSeeResource(5)
->assertSeeResource(6)
->runFilter(function ($browser) {
$browser->select('select[dusk="commentable-default-morph-to-field-filter"]', 'links')->pause(1000);
$browser->select('select[dusk="commentable-morph-to-field-filter"]', 'links')->pause(1000);
})
->waitForTable()
->assertFilterCount(1)
Expand All @@ -145,7 +145,7 @@ public function test_it_can_filter_morph_to_field()
->assertDontSeeResource(6);

$browser->runFilter(function ($browser) {
$browser->select('select[dusk="commentable-default-morph-to-field-filter"]', 'posts')->pause(1000);
$browser->select('select[dusk="commentable-morph-to-field-filter"]', 'posts')->pause(1000);
})
->waitForTable()
->assertFilterCount(1)
Expand All @@ -157,7 +157,7 @@ public function test_it_can_filter_morph_to_field()
->assertDontSeeResource(6);

$browser->runFilter(function ($browser) {
$browser->select('select[dusk="commentable-default-morph-to-field-filter"]', 'videos')->pause(1000);
$browser->select('select[dusk="commentable-morph-to-field-filter"]', 'videos')->pause(1000);
})
->waitForTable()
->assertFilterCount(1)
Expand Down Expand Up @@ -188,7 +188,7 @@ public function test_it_can_filter_email_field()
->assertSeeResource(4)
->assertSeeResource(5)
->runFilter(function ($browser) use ($subscribers) {
$browser->type('@email-default-email-field-filter', $subscribers[2]->email)->pause(1000);
$browser->type('@email-email-field-filter', $subscribers[2]->email)->pause(1000);
})
->waitForTable()
->assertFilterCount(1)
Expand All @@ -214,7 +214,7 @@ public function test_it_can_filter_searchable_belongs_to_field()
->within(new IndexComponent('posts'), function ($browser) {
$browser->waitForTable()
->runFilter(function ($browser) {
$browser->within(new SearchInputComponent('user-default-belongs-to-field', 'filter'), function ($browser) {
$browser->within(new SearchInputComponent('user-belongs-to-field-filter'), function ($browser) {
$browser->searchFirstRelation(1)->pause(1000);
});
})
Expand All @@ -227,7 +227,7 @@ public function test_it_can_filter_searchable_belongs_to_field()
->assertDontSeeResource(5);

$browser->runFilter(function ($browser) {
$browser->within(new SearchInputComponent('user-default-belongs-to-field', 'filter'), function ($browser) {
$browser->within(new SearchInputComponent('user-belongs-to-field-filter'), function ($browser) {
$browser->searchFirstRelation(2)->pause(1000);
});
})
Expand All @@ -240,7 +240,7 @@ public function test_it_can_filter_searchable_belongs_to_field()
->assertSeeResource(5);

$browser->runFilter(function ($browser) {
$browser->click('@user-default-belongs-to-field-search-filter-clear-button')->pause(1000);
$browser->click('@user-belongs-to-field-filter-search-input-clear-button')->pause(1000);
})
->waitForTable()
->assertFilterCount(0)
Expand All @@ -251,7 +251,7 @@ public function test_it_can_filter_searchable_belongs_to_field()
->assertSeeResource(5);

$browser->runFilter(function ($browser) {
$browser->within(new SearchInputComponent('user-default-belongs-to-field', 'filter'), function ($browser) {
$browser->within(new SearchInputComponent('user-belongs-to-field-filter'), function ($browser) {
$browser->assertEmptySearchResult();
});
}, false);
Expand All @@ -277,14 +277,14 @@ public function test_it_can_filter_multiselect_field()
->within(new IndexComponent('profiles'), function ($browser) {
$browser->waitForTable()
->runFilter(function ($browser) {
$browser->select('@interests-default-multi-select-field-filter', ['laravel', 'phpunit'])->pause(1000);
$browser->select('@interests-multi-select-field-filter', ['laravel', 'phpunit'])->pause(1000);
})->waitForTable()
->assertSeeResource(1)
->assertSeeResource(2)
->assertDontSeeResource(3);

$browser->runFilter(function ($browser) {
$browser->select('@interests-default-multi-select-field-filter', ['laravel', 'livewire'])->pause(1000);
$browser->select('@interests-multi-select-field-filter', ['laravel', 'livewire'])->pause(1000);
})
->waitForTable()
->assertSeeResource(1)
Expand All @@ -304,7 +304,7 @@ public function test_it_can_filter_date_field()
->within(new IndexComponent('users'), function ($browser) {
$browser->waitForTable()
->runFilter(function ($browser) {
$browser->whenAvailable('@created_at-default-date-time-field-range-start', function ($browser) {
$browser->whenAvailable('@created_at-date-time-field-filter-range-start', function ($browser) {
$browser->typeInDateTimeField('', now()->startOfMonth());
});
})->waitForTable()
Expand All @@ -313,7 +313,7 @@ public function test_it_can_filter_date_field()
->waitForTable()
->assertFilterCount(0)
->runFilter(function ($browser) {
$browser->whenAvailable('@created_at-default-date-time-field-range-start', function ($browser) {
$browser->whenAvailable('@created_at-date-time-field-filter-range-start', function ($browser) {
$browser->typeInDateTimeField('', now()->startOfMonth());
});
})->waitForTable()
Expand Down
Loading

0 comments on commit b6f5d97

Please sign in to comment.