Merge remote-tracking branch 'origin/#20-vacation-requests' into #20-vacation-requests
# Conflicts: # app/Enums/VacationType.php # app/Helpers/Rules/MinimumOneVacationDayRule.php # app/Helpers/Rules/PendingVacationRequestInSameRange.php # app/Helpers/VacationRequestValidator.php # app/Http/Controllers/VacationRequestController.php # app/Http/Resources/VacationRequestResource.php # app/Models/VacationRequest.php # config/sanctum.php # database/factories/VacationRequestFactory.php # database/migrations/2022_01_26_100039_create_vacation_requests_table.php # package-lock.json # resources/js/Pages/VacationRequest/Create.vue # resources/js/Pages/VacationRequest/Index.vue # resources/js/Shared/MainMenu.vue # resources/lang/pl.json # routes/web.php
This commit is contained in:
@@ -9,6 +9,7 @@ use Illuminate\Support\Carbon;
|
||||
use Inertia\Testing\AssertableInertia as Assert;
|
||||
use Tests\FeatureTestCase;
|
||||
use Toby\Enums\EmploymentForm;
|
||||
use Toby\Enums\Role;
|
||||
use Toby\Models\User;
|
||||
|
||||
class UserTest extends FeatureTestCase
|
||||
@@ -87,6 +88,7 @@ class UserTest extends FeatureTestCase
|
||||
->post("/users", [
|
||||
"firstName" => "John",
|
||||
"lastName" => "Doe",
|
||||
"role" => Role::EMPLOYEE->value,
|
||||
"email" => "john.doe@example.com",
|
||||
"employmentForm" => EmploymentForm::B2B_CONTRACT->value,
|
||||
"employmentDate" => Carbon::now()->toDateString(),
|
||||
@@ -122,6 +124,7 @@ class UserTest extends FeatureTestCase
|
||||
"firstName" => "John",
|
||||
"lastName" => "Doe",
|
||||
"email" => "john.doe@example.com",
|
||||
"role" => Role::EMPLOYEE->value,
|
||||
"employmentForm" => EmploymentForm::B2B_CONTRACT->value,
|
||||
"employmentDate" => Carbon::now()->toDateString(),
|
||||
])
|
||||
|
Reference in New Issue
Block a user