kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

Merge branch 'main' into #43-vacation-summary-for-employee

Browse Source 
# Conflicts:
#	app/Infrastructure/Http/Controllers/HolidayController.php
#	app/Infrastructure/Http/Controllers/VacationLimitController.php
#	app/Infrastructure/Http/Controllers/VacationRequestController.php
#	composer.lock
#	resources/js/Pages/Holidays/Index.vue
#	resources/js/Pages/VacationRequest/Create.vue
This commit is contained in:
Adrian Hopek
2022-03-02 10:01:14 +01:00
parent 758689d376 d825dd727f
commit 474707e691
51 changed files with 1993 additions and 1401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Feature/VacationLimitTest.php
View File

@@ -16,7 +16,7 @@ class VacationLimitTest extends FeatureTestCase
public function testAdminCanSeeVacationLimits(): void
{
$admin = User::factory()->createQuietly();
$admin = User::factory()->admin()->createQuietly();
User::factory(10)->create();
@@ -32,7 +32,7 @@ class VacationLimitTest extends FeatureTestCase
public function testAdminCanUpdateVacationLimits(): void
{
$admin = User::factory()->createQuietly();
$admin = User::factory()->admin()->createQuietly();
User::factory(3)->create();