adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-15 11:42:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed timezone problem in unit tests

Browse Source
This commit is contained in:
Constantin Graf
2024-09-30 10:58:33 +02:00
committed by Constantin Graf
parent 8b50f33cc9
commit 78ea8a673b
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
database/factories/TimeEntryFactory.php
View File

@@ -147,8 +147,8 @@ class TimeEntryFactory extends Factory
{ {
return $this->state(function (array $attributes) use ($start, $durationInSeconds): array { return $this->state(function (array $attributes) use ($start, $durationInSeconds): array {
return [ return [
'start' => $start->utc(), 'start' => $start->copy()->utc(),
'end' => $start->copy()->addSeconds($durationInSeconds), 'end' => $start->copy()->utc()->addSeconds($durationInSeconds),
]; ];
}); });
} }
@@ -157,7 +157,7 @@ class TimeEntryFactory extends Factory
{ {
return $this->state(function (array $attributes) use ($start): array { return $this->state(function (array $attributes) use ($start): array {
return [ return [
'start' => $start->utc(), 'start' => $start->copy()->utc(),
]; ];
}); });
} }

2
tests/TestCase.php
View File

@@ -31,6 +31,8 @@ abstract class TestCase extends BaseTestCase
$mock->shouldReceive('getTrialUntil')->andReturn(null); $mock->shouldReceive('getTrialUntil')->andReturn(null);
$mock->shouldReceive('isBlocked')->andReturn(false); $mock->shouldReceive('isBlocked')->andReturn(false);
}); });
// Note: The following line can be used to test timezone edge cases.
// $this->travelTo(Carbon::now()->timezone('Europe/Vienna')->setHour(0)->setMinute(59)->setSecond(0));
} }
protected function mockPrivateStorage(): void protected function mockPrivateStorage(): void

8
tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php
View File

@@ -473,8 +473,8 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
'time-entries:view:all', 'time-entries:view:all',
]); ]);
$project = Project::factory()->forOrganization($data->organization)->create(); $project = Project::factory()->forOrganization($data->organization)->create();
$day1 = Carbon::now()->timezone($data->user->timezone)->subDays(1)->utc(); $day1 = Carbon::now()->timezone($data->user->timezone)->subDays(1);
$day2 = Carbon::now()->timezone($data->user->timezone)->subDays(3)->utc(); $day2 = Carbon::now()->timezone($data->user->timezone)->subDays(3);
$timeEntry1NoProject = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration($day1, 10)->create(); $timeEntry1NoProject = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration($day1, 10)->create();
$timeEntry2NoProject = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration($day2, 10)->create(); $timeEntry2NoProject = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration($day2, 10)->create();
$timeEntry1WithProject = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->forProject($project)->startWithDuration($day1, 10)->create(); $timeEntry1WithProject = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->forProject($project)->startWithDuration($day1, 10)->create();
@@ -552,8 +552,8 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
'time-entries:view:all', 'time-entries:view:all',
]); ]);
$project = Project::factory()->forOrganization($data->organization)->create(); $project = Project::factory()->forOrganization($data->organization)->create();
$day1 = Carbon::now()->timezone($data->user->timezone)->subDays(1)->utc(); $day1 = Carbon::now()->timezone($data->user->timezone)->subDays(1);
$day2 = Carbon::now()->timezone($data->user->timezone)->subDays(3)->utc(); $day2 = Carbon::now()->timezone($data->user->timezone)->subDays(3);
$timeEntry1NoProject = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration($day1, 10)->create(); $timeEntry1NoProject = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration($day1, 10)->create();
$timeEntry2NoProject = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration($day2, 10)->create(); $timeEntry2NoProject = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration($day2, 10)->create();
$timeEntry1WithProject = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->forProject($project)->startWithDuration($day1, 10)->create(); $timeEntry1WithProject = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->forProject($project)->startWithDuration($day1, 10)->create();

7
tests/Unit/Service/TimeEntryAggregationServiceTest.php
View File

@@ -140,6 +140,7 @@ class TimeEntryAggregationServiceTest extends TestCaseWithDatabase
public function test_aggregate_time_entries_empty_state_by_day_and_project_with_filled_gaps(): void public function test_aggregate_time_entries_empty_state_by_day_and_project_with_filled_gaps(): void
{ {
// Arrange // Arrange
$timezone = 'Europe/Vienna';
$query = TimeEntry::query(); $query = TimeEntry::query();
// Act // Act
@@ -147,7 +148,7 @@ class TimeEntryAggregationServiceTest extends TestCaseWithDatabase
$query, $query,
TimeEntryAggregationType::Day, TimeEntryAggregationType::Day,
TimeEntryAggregationType::Project, TimeEntryAggregationType::Project,
'Europe/Vienna', $timezone,
Weekday::Monday, Weekday::Monday,
true, true,
Carbon::now()->subDays(2)->utc(), Carbon::now()->subDays(2)->utc(),
@@ -161,14 +162,14 @@ class TimeEntryAggregationServiceTest extends TestCaseWithDatabase
'grouped_type' => 'day', 'grouped_type' => 'day',
'grouped_data' => [ 'grouped_data' => [
[ [
'key' => Carbon::now()->subDays(2)->utc()->format('Y-m-d'), 'key' => Carbon::now()->subDays(2)->timezone($timezone)->format('Y-m-d'),
'seconds' => 0, 'seconds' => 0,
'cost' => 0, 'cost' => 0,
'grouped_type' => 'project', 'grouped_type' => 'project',
'grouped_data' => [], 'grouped_data' => [],
], ],
[ [
'key' => Carbon::now()->subDay()->utc()->format('Y-m-d'), 'key' => Carbon::now()->subDay()->timezone($timezone)->format('Y-m-d'),
'seconds' => 0, 'seconds' => 0,
'cost' => 0, 'cost' => 0,
'grouped_type' => 'project', 'grouped_type' => 'project',