Compare commits
No commits in common. "c1d8008b5d8ea7e9e55907227ac797cf93756b71" and "7f7a9450bfd16650e5b9752fc3620041d5603e55" have entirely different histories.
c1d8008b5d
...
7f7a9450bf
7 changed files with 28 additions and 115 deletions
|
|
@ -1662,6 +1662,12 @@ parameters:
|
|||
count: 2
|
||||
path: tests/Unit/Schedule/ScheduleGeneratorTest.php
|
||||
|
||||
-
|
||||
message: '#^Parameter \#1 \$callback of method Illuminate\\Support\\Collection\<int,Carbon\\Carbon\>\:\:reduce\(\) expects callable\(Illuminate\\Support\\Carbon\|null, Carbon\\Carbon, int\)\: Illuminate\\Support\\Carbon, Closure\(Illuminate\\Support\\Carbon\|null, Illuminate\\Support\\Carbon\)\: Illuminate\\Support\\Carbon given\.$#'
|
||||
identifier: argument.type
|
||||
count: 1
|
||||
path: tests/Unit/Schedule/ScheduleGeneratorTest.php
|
||||
|
||||
-
|
||||
message: '#^Access to an undefined property Illuminate\\Database\\Eloquent\\Model\:\:\$id\.$#'
|
||||
identifier: property.notFound
|
||||
|
|
|
|||
30
shell.nix
30
shell.nix
|
|
@ -109,35 +109,7 @@ pkgs.mkShell {
|
|||
pest-browser() {
|
||||
# Run Pest browser tests (Playwright) on the host. Pass --headed for a
|
||||
# visible browser or --debug to pause on failure. Requires `npm run build`.
|
||||
# A path argument replaces the default suite; flags alone keep it.
|
||||
# Only existing paths count, so `--filter Logout` cannot silently
|
||||
# unscope the run to the whole test directory.
|
||||
local has_path=0
|
||||
local skip_next=0
|
||||
local arg
|
||||
for arg in "$@"; do
|
||||
if [ "$skip_next" -eq 1 ]; then
|
||||
skip_next=0
|
||||
continue
|
||||
fi
|
||||
case "$arg" in
|
||||
--filter|--group|--exclude-group|--test-suffix)
|
||||
skip_next=1
|
||||
;;
|
||||
-*) ;;
|
||||
*)
|
||||
if [ -e "$arg" ]; then
|
||||
has_path=1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [ "$has_path" -eq 1 ]; then
|
||||
vendor/bin/pest "$@"
|
||||
else
|
||||
vendor/bin/pest tests/Browser "$@"
|
||||
fi
|
||||
vendor/bin/pest tests/Browser "$@"
|
||||
}
|
||||
|
||||
dev-fix-permissions() {
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
<?php
|
||||
|
||||
it('logs out and lands on the login page', function () {
|
||||
$page = loginAs(createPlanner());
|
||||
|
||||
logout($page)
|
||||
->assertPathIs('/login')
|
||||
->assertSee('Sign In');
|
||||
});
|
||||
|
||||
it('blocks protected routes after logging out', function (string $path) {
|
||||
$page = loginAs(createPlanner());
|
||||
|
||||
logout($page)
|
||||
->assertPathIs('/login')
|
||||
->navigate($path)
|
||||
->assertPathIs('/login')
|
||||
->assertSee('Sign In');
|
||||
})->with(['/dashboard', '/dishes', '/schedule', '/users']);
|
||||
|
||||
it('does not restore an authenticated view via the back button', function () {
|
||||
$planner = createPlanner();
|
||||
|
||||
$page = loginAs($planner)->assertSee($planner->name);
|
||||
|
||||
logout($page)
|
||||
->assertPathIs('/login')
|
||||
->back()
|
||||
->assertPathIs('/login')
|
||||
->assertDontSee('Logout');
|
||||
});
|
||||
|
|
@ -90,21 +90,4 @@ public function test_users_can_logout(): void
|
|||
$response->assertRedirect('/');
|
||||
$this->assertGuest();
|
||||
}
|
||||
|
||||
public function test_logout_invalidates_the_session(): void
|
||||
{
|
||||
$user = Planner::factory()->create();
|
||||
|
||||
// Boots the session store so getId() below reflects a real value.
|
||||
$this->actingAs($user)->get('/dashboard');
|
||||
|
||||
session()->put('scratch', 'value');
|
||||
|
||||
$sessionId = session()->getId();
|
||||
|
||||
$this->actingAs($user)->post('/logout');
|
||||
|
||||
$this->assertNotSame($sessionId, session()->getId());
|
||||
$this->assertFalse(session()->has('scratch'));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
use App\Models\Planner;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Pest\Browser\Api\AwaitableWebpage;
|
||||
use Pest\Browser\Api\Webpage;
|
||||
use Tests\BrowserTestCase;
|
||||
use Tests\TestCase;
|
||||
|
|
@ -63,15 +62,3 @@ function loginAndGoToSchedule()
|
|||
{
|
||||
return loginAs(createPlanner(), '/schedule');
|
||||
}
|
||||
|
||||
/**
|
||||
* Open the account dropdown and submit the logout form.
|
||||
*
|
||||
* @return Webpage
|
||||
*/
|
||||
function logout(Webpage|AwaitableWebpage $page)
|
||||
{
|
||||
return $page
|
||||
->click('button[\@click="open = !open"]')
|
||||
->click('.sm\:flex form[action$="/logout"] button[type="submit"]');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
use App\WeekdaysEnum;
|
||||
use DishPlanner\Schedule\Services\ScheduleGenerator;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Illuminate\Support\Carbon;
|
||||
use Tests\TestCase;
|
||||
use Tests\Traits\HasPlanner;
|
||||
|
||||
|
|
@ -127,23 +128,19 @@ public function test_it_takes_minimum_recurrences_into_account(): void
|
|||
|
||||
$this->assertTrue(Schedule::all()->isNotEmpty());
|
||||
|
||||
$recurringDates = Schedule::all()
|
||||
->filter(fn (Schedule $schedule) => $schedule->scheduledUserDishes
|
||||
->contains(fn ($scheduledUserDish) => $scheduledUserDish->userDish->dish->id === $dishRecurring->id)
|
||||
)
|
||||
Schedule::all()
|
||||
->filter(fn (Schedule $schedule) => $schedule->scheduledUserDishes()->first()->userDish->dish->id === $dishRecurring->id)
|
||||
->map(fn (Schedule $schedule) => $schedule->date)
|
||||
->sort()
|
||||
->values();
|
||||
->reduce(function (?Carbon $previousDate, Carbon $currentDate) use ($recurringMinimum) {
|
||||
if (! is_null($previousDate)) {
|
||||
$this->assertGreaterThanOrEqual(
|
||||
$recurringMinimum,
|
||||
$previousDate->diffInDays($currentDate),
|
||||
'Dates are not spaced properly'
|
||||
);
|
||||
}
|
||||
|
||||
$this->assertGreaterThan(1, $recurringDates->count(), 'Recurring dish was not scheduled often enough to verify spacing');
|
||||
|
||||
$gaps = $recurringDates
|
||||
->sliding(2)
|
||||
->map(fn ($pair) => (int) $pair->first()->diffInDays($pair->last()));
|
||||
|
||||
$this->assertEmpty(
|
||||
$gaps->reject(fn (int $gap) => $gap >= $recurringMinimum)->all(),
|
||||
'Dates are not spaced properly'
|
||||
);
|
||||
return $currentDate;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,20 +55,19 @@ public function test_includes_correct_day_numbers(): void
|
|||
|
||||
public function test_marks_today_correctly(): void
|
||||
{
|
||||
$this->travelTo(Carbon::createFromDate(2026, 3, 15)->startOfDay());
|
||||
|
||||
$planner = $this->planner;
|
||||
$today = now();
|
||||
|
||||
$calendarDays = $this->service->getCalendarDays($planner, 3, 2026);
|
||||
$calendarDays = $this->service->getCalendarDays($planner, $today->month, $today->year);
|
||||
|
||||
$todayIndex = 14;
|
||||
$todayIndex = $today->day - 1;
|
||||
$this->assertTrue($calendarDays[$todayIndex]['isToday']);
|
||||
|
||||
$otherDaysMarkedToday = collect($calendarDays)
|
||||
->filter(fn (array $day, int $index) => $index !== $todayIndex && $day['day'] !== null)
|
||||
->filter(fn (array $day) => $day['isToday']);
|
||||
|
||||
$this->assertCount(0, $otherDaysMarkedToday);
|
||||
foreach ($calendarDays as $index => $day) {
|
||||
if ($index !== $todayIndex && $day['day'] !== null) {
|
||||
$this->assertFalse($day['isToday']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public function test_includes_scheduled_dishes(): void
|
||||
|
|
|
|||
Loading…
Reference in a new issue