From 5423b03201cc1602e8e61c7974da547bad62a4d7 Mon Sep 17 00:00:00 2001 From: Constantin Graf Date: Fri, 20 Dec 2024 19:28:45 -0500 Subject: [PATCH] Fixed timezones in unit tests --- .env.ci | 1 + .../Api/V1/Public/PublicReportEndpointTest.php | 18 ++++++++++-------- .../Endpoint/Api/V1/TimeEntryEndpointTest.php | 4 ++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.env.ci b/.env.ci index 0deb6363..7cfb7a3d 100644 --- a/.env.ci +++ b/.env.ci @@ -4,6 +4,7 @@ APP_KEY= APP_DEBUG=true APP_URL=http://localhost APP_FORCE_HTTPS=false +APP_ENABLE_REGISTRATION=true SESSION_SECURE_COOKIE=false # Logging diff --git a/tests/Unit/Endpoint/Api/V1/Public/PublicReportEndpointTest.php b/tests/Unit/Endpoint/Api/V1/Public/PublicReportEndpointTest.php index 909e311e..b0b81e9d 100644 --- a/tests/Unit/Endpoint/Api/V1/Public/PublicReportEndpointTest.php +++ b/tests/Unit/Endpoint/Api/V1/Public/PublicReportEndpointTest.php @@ -79,6 +79,7 @@ public function test_show_fails_with_not_found_if_report_is_expired(): void public function test_show_returns_detailed_information_about_the_report(): void { // Arrange + $timezone = 'Europe/Vienna'; $reportDto = new ReportPropertiesDto; $organization = Organization::factory()->create(); $reportDto->start = now()->subDays(2); @@ -87,7 +88,7 @@ public function test_show_returns_detailed_information_about_the_report(): void $reportDto->subGroup = TimeEntryAggregationType::Task; $reportDto->historyGroup = TimeEntryAggregationTypeInterval::Day; $reportDto->weekStart = Weekday::Monday; - $reportDto->timezone = 'Europe/Vienna'; + $reportDto->timezone = $timezone; $report = Report::factory()->forOrganization($organization)->public()->create([ 'public_until' => null, 'properties' => $reportDto, @@ -182,7 +183,7 @@ public function test_show_returns_detailed_information_about_the_report(): void 'grouped_type' => TimeEntryAggregationTypeInterval::Day->value, 'grouped_data' => [ [ - 'key' => now()->subDays(2)->toDateString(), + 'key' => now()->timezone($timezone)->subDays(2)->toDateString(), 'seconds' => 0, 'cost' => 0, 'grouped_type' => null, @@ -191,7 +192,7 @@ public function test_show_returns_detailed_information_about_the_report(): void 'color' => null, ], [ - 'key' => now()->subDays(1)->toDateString(), + 'key' => now()->timezone($timezone)->subDays(1)->toDateString(), 'seconds' => 300, 'cost' => 0, 'grouped_type' => null, @@ -200,7 +201,7 @@ public function test_show_returns_detailed_information_about_the_report(): void 'color' => null, ], [ - 'key' => now()->toDateString(), + 'key' => now()->timezone($timezone)->toDateString(), 'seconds' => 0, 'cost' => 0, 'grouped_type' => null, @@ -320,6 +321,7 @@ public function test_show_returns_detailed_information_about_the_report_with_all public function test_if_the_resources_behind_the_filters_no_longer_exist_the_report_ignores_those_filters_but_this_does_not_increase_the_visible_data(): void { // Arrange + $timezone = 'Europe/Vienna'; $organization = Organization::factory()->create(); $client = Client::factory()->forOrganization($organization)->create(); $project = Project::factory()->forClient($client)->forOrganization($organization)->create(); @@ -341,7 +343,7 @@ public function test_if_the_resources_behind_the_filters_no_longer_exist_the_rep $reportDto->subGroup = TimeEntryAggregationType::Task; $reportDto->historyGroup = TimeEntryAggregationTypeInterval::Day; $reportDto->weekStart = Weekday::Monday; - $reportDto->timezone = 'Europe/Vienna'; + $reportDto->timezone = $timezone; $reportDto->setMemberIds([Str::uuid()->toString()]); $reportDto->setClientIds([Str::uuid()->toString()]); $reportDto->setProjectIds([Str::uuid()->toString()]); @@ -382,7 +384,7 @@ public function test_if_the_resources_behind_the_filters_no_longer_exist_the_rep 'grouped_type' => TimeEntryAggregationTypeInterval::Day->value, 'grouped_data' => [ [ - 'key' => now()->subDays(2)->toDateString(), + 'key' => now()->timezone($timezone)->subDays(2)->toDateString(), 'seconds' => 0, 'cost' => 0, 'grouped_type' => null, @@ -391,7 +393,7 @@ public function test_if_the_resources_behind_the_filters_no_longer_exist_the_rep 'color' => null, ], [ - 'key' => now()->subDays(1)->toDateString(), + 'key' => now()->timezone($timezone)->subDays(1)->toDateString(), 'seconds' => 0, 'cost' => 0, 'grouped_type' => null, @@ -400,7 +402,7 @@ public function test_if_the_resources_behind_the_filters_no_longer_exist_the_rep 'color' => null, ], [ - 'key' => now()->toDateString(), + 'key' => now()->timezone($timezone)->toDateString(), 'seconds' => 0, 'cost' => 0, 'grouped_type' => null, diff --git a/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php b/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php index 94bde8a2..22b8773b 100644 --- a/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php +++ b/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php @@ -261,7 +261,7 @@ public function test_index_endpoint_filter_only_full_dates_returns_time_entries_ { // Arrange $now = Carbon::create(2024, 1, 1, 12, 0, 0, 'Europe/Vienna'); - $this->freezeTime($now); + $this->travelTo($now); $data = $this->createUserWithPermission([ 'time-entries:view:own', ]); @@ -310,7 +310,7 @@ public function test_index_endpoint_filter_only_full_dates_returns_time_entries_ { // Arrange $now = Carbon::create(2024, 1, 1, 12, 0, 0, 'Europe/Vienna'); - $this->freezeTime($now); + $this->travelTo($now); $data = $this->createUserWithPermission([ 'time-entries:view:own', ]);