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

15
tests/Feature/HolidayTest.php
View File

@@ -34,7 +34,8 @@ class HolidayTest extends FeatureTestCase
public function testAdminCanCreateHoliday(): void
{
$admin = User::factory()->create();
$admin = User::factory()->admin()->create();
$currentYearPeriod = YearPeriod::current();
$this->actingAs($admin)
@@ -53,7 +54,8 @@ class HolidayTest extends FeatureTestCase
public function testAdminCannotCreateHolidayForYearPeriodThatDoesntExist(): void
{
$admin = User::factory()->create();
$admin = User::factory()->admin()->create();
$year = YearPeriod::query()->max("year") + 1;
$this->actingAs($admin)
@@ -66,7 +68,8 @@ class HolidayTest extends FeatureTestCase
public function testAdminCannotCreateHolidayIfGivenDataIsUsed(): void
{
$admin = User::factory()->create();
$admin = User::factory()->admin()->create();
$currentYearPeriod = YearPeriod::current();
$sameDate = Carbon::create($currentYearPeriod->year, 5, 20)->toDateString();
@@ -85,7 +88,8 @@ class HolidayTest extends FeatureTestCase
public function testAdminCanEditHoliday(): void
{
$admin = User::factory()->create();
$admin = User::factory()->admin()->create();
$currentYearPeriod = YearPeriod::current();
$holiday = Holiday::factory()->create([
@@ -115,7 +119,8 @@ class HolidayTest extends FeatureTestCase
public function testAdminCanDeleteHoliday(): void
{
$admin = User::factory()->create();
$admin = User::factory()->admin()->create();
$holiday = Holiday::factory()->create();
$this->actingAs($admin)

20
tests/Feature/UserTest.php
View File

@@ -19,7 +19,7 @@ class UserTest extends FeatureTestCase
public function testAdminCanSeeUsersList(): void
{
User::factory()->count(10)->create();
$admin = User::factory()->create();
$admin = User::factory()->admin()->create();
$this->assertDatabaseCount("users", 11);
@@ -38,18 +38,21 @@ class UserTest extends FeatureTestCase
"first_name" => "Test",
"last_name" => "User1",
])->create();
User::factory([
"first_name" => "Test",
"last_name" => "User2",
])->create();
User::factory([
"first_name" => "Test",
"last_name" => "User3",
])->create();
$admin = User::factory([
"first_name" => "John",
"last_name" => "Doe",
])->create();
])->admin()->create();
$this->assertDatabaseCount("users", 4);
@@ -66,7 +69,7 @@ class UserTest extends FeatureTestCase
public function testUserListIsPaginated(): void
{
User::factory()->count(15)->create();
$admin = User::factory()->create();
$admin = User::factory()->admin()->create();
$this->assertDatabaseCount("users", 16);
@@ -81,7 +84,7 @@ class UserTest extends FeatureTestCase
public function testAdminCanCreateUser(): void
{
$admin = User::factory()->create();
$admin = User::factory()->admin()->create();
Carbon::setTestNow(Carbon::now());
$this->actingAs($admin)
@@ -109,7 +112,8 @@ class UserTest extends FeatureTestCase
public function testAdminCanEditUser(): void
{
$admin = User::factory()->create();
$admin = User::factory()->admin()->create();
$user = User::factory()->create();
Carbon::setTestNow();
@@ -147,7 +151,8 @@ class UserTest extends FeatureTestCase
public function testAdminCanDeleteUser(): void
{
$admin = User::factory()->create();
$admin = User::factory()->admin()->create();
$user = User::factory()->create();
$this->actingAs($admin)
@@ -159,7 +164,8 @@ class UserTest extends FeatureTestCase
public function testAdminCanRestoreUser(): void
{
$admin = User::factory()->create();
$admin = User::factory()->admin()->create();
$user = User::factory()->create();
$user->delete();

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();

39
tests/Feature/VacationRequestTest.php
View File

@@ -9,13 +9,16 @@ use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Event;
use Inertia\Testing\AssertableInertia as Assert;
use Tests\FeatureTestCase;
use Toby\Domain\Enums\VacationRequestState;
use Toby\Domain\Enums\VacationType;
use Toby\Domain\Events\VacationRequestAcceptedByAdministrative;
use Toby\Domain\Events\VacationRequestAcceptedByTechnical;
use Toby\Domain\Events\VacationRequestApproved;
use Toby\Domain\Events\VacationRequestRejected;
use Toby\Domain\PolishHolidaysRetriever;
use Toby\Domain\States\VacationRequest\Approved;
use Toby\Domain\States\VacationRequest\Rejected;
use Toby\Domain\States\VacationRequest\WaitingForAdministrative;
use Toby\Domain\States\VacationRequest\WaitingForTechnical;
use Toby\Eloquent\Models\User;
use Toby\Eloquent\Models\VacationLimit;
use Toby\Eloquent\Models\VacationRequest;
@@ -83,7 +86,7 @@ class VacationRequestTest extends FeatureTestCase
"year_period_id" => $currentYearPeriod->id,
"name" => "1/" . $currentYearPeriod->year,
"type" => VacationType::Vacation->value,
"state" => VacationRequestState::WaitingForTechnical,
"state" => WaitingForTechnical::$name,
"from" => Carbon::create($currentYearPeriod->year, 2, 7)->toDateString(),
"to" => Carbon::create($currentYearPeriod->year, 2, 11)->toDateString(),
"comment" => "Comment for the vacation request.",
@@ -92,7 +95,7 @@ class VacationRequestTest extends FeatureTestCase
public function testUserCanCreateVacationRequestOnEmployeeBehalf(): void
{
$creator = User::factory()->createQuietly();
$creator = User::factory()->admin()->createQuietly();
$user = User::factory()->createQuietly();
$currentYearPeriod = YearPeriod::current();
@@ -120,7 +123,7 @@ class VacationRequestTest extends FeatureTestCase
"year_period_id" => $currentYearPeriod->id,
"name" => "1/" . $currentYearPeriod->year,
"type" => VacationType::Vacation->value,
"state" => VacationRequestState::WaitingForTechnical,
"state" => WaitingForTechnical::$name,
"from" => Carbon::create($currentYearPeriod->year, 2, 7)->toDateString(),
"to" => Carbon::create($currentYearPeriod->year, 2, 11)->toDateString(),
"comment" => "Comment for the vacation request.",
@@ -131,7 +134,7 @@ class VacationRequestTest extends FeatureTestCase
{
Event::fake(VacationRequestApproved::class);
$creator = User::factory()->createQuietly();
$creator = User::factory()->admin()->createQuietly();
$user = User::factory()->createQuietly();
$currentYearPeriod = YearPeriod::current();
@@ -160,7 +163,7 @@ class VacationRequestTest extends FeatureTestCase
"year_period_id" => $currentYearPeriod->id,
"name" => "1/" . $currentYearPeriod->year,
"type" => VacationType::Vacation->value,
"state" => VacationRequestState::Approved,
"state" => Approved::$name,
"from" => Carbon::create($currentYearPeriod->year, 2, 7)->toDateString(),
"to" => Carbon::create($currentYearPeriod->year, 2, 11)->toDateString(),
"comment" => "Comment for the vacation request.",
@@ -172,11 +175,11 @@ class VacationRequestTest extends FeatureTestCase
Event::fake(VacationRequestAcceptedByTechnical::class);
$user = User::factory()->createQuietly();
$technicalApprover = User::factory()->createQuietly();
$technicalApprover = User::factory()->technicalApprover()->createQuietly();
$currentYearPeriod = YearPeriod::current();
$vacationRequest = VacationRequest::factory([
"state" => VacationRequestState::WaitingForTechnical,
"state" => WaitingForTechnical::class,
"type" => VacationType::Vacation,
])
->for($user)
@@ -195,12 +198,12 @@ class VacationRequestTest extends FeatureTestCase
Event::fake(VacationRequestAcceptedByAdministrative::class);
$user = User::factory()->createQuietly();
$administrativeApprover = User::factory()->createQuietly();
$administrativeApprover = User::factory()->administrativeApprover()->createQuietly();
$currentYearPeriod = YearPeriod::current();
$vacationRequest = VacationRequest::factory([
"state" => VacationRequestState::WaitingForAdministrative,
"state" => WaitingForAdministrative::class,
])
->for($user)
->for($currentYearPeriod)
@@ -218,7 +221,7 @@ class VacationRequestTest extends FeatureTestCase
Event::fake(VacationRequestRejected::class);
$user = User::factory()->createQuietly();
$technicalApprover = User::factory()->createQuietly();
$technicalApprover = User::factory()->technicalApprover()->createQuietly();
$currentYearPeriod = YearPeriod::current();
VacationLimit::factory([
@@ -229,7 +232,7 @@ class VacationRequestTest extends FeatureTestCase
->create();
$vacationRequest = VacationRequest::factory([
"state" => VacationRequestState::WaitingForTechnical,
"state" => WaitingForTechnical::class,
"type" => VacationType::Vacation,
])
->for($user)
@@ -241,6 +244,9 @@ class VacationRequestTest extends FeatureTestCase
->assertSessionHasNoErrors();
Event::assertDispatched(VacationRequestRejected::class);
$this->assertDatabaseHas("vacation_requests", [
"state" => Rejected::$name,
]);
}
public function testUserCannotCreateVacationRequestIfHeExceedsHisVacationLimit(): void
@@ -339,7 +345,7 @@ class VacationRequestTest extends FeatureTestCase
VacationRequest::factory([
"type" => VacationType::Vacation->value,
"state" => VacationRequestState::WaitingForTechnical,
"state" => WaitingForTechnical::class,
"from" => Carbon::create($currentYearPeriod->year, 2, 1)->toDateString(),
"to" => Carbon::create($currentYearPeriod->year, 2, 4)->toDateString(),
"comment" => "Comment for the vacation request.",
@@ -358,8 +364,7 @@ class VacationRequestTest extends FeatureTestCase
])
->assertSessionHasErrors([
"vacationRequest" => __("You have pending vacation request in this range."),
])
;
]);
}
public function testUserCannotCreateVacationRequestIfHeHasApprovedVacationRequestInThisRange(): void
@@ -367,7 +372,7 @@ class VacationRequestTest extends FeatureTestCase
$user = User::factory()->createQuietly();
$currentYearPeriod = YearPeriod::current();
$vacationLimit = VacationLimit::factory([
VacationLimit::factory([
"days" => 20,
])
->for($user)
@@ -376,7 +381,7 @@ class VacationRequestTest extends FeatureTestCase
VacationRequest::factory([
"type" => VacationType::Vacation->value,
"state" => VacationRequestState::Approved,
"state" => Approved::class,
"from" => Carbon::create($currentYearPeriod->year, 2, 2)->toDateString(),
"to" => Carbon::create($currentYearPeriod->year, 2, 4)->toDateString(),
"comment" => "Comment for the vacation request.",