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

Fixed static code analyser and added unit tests for ip lookup

Browse Source
This commit is contained in:
Constantin Graf
2024-07-01 17:25:20 +02:00
parent 442da936d0
commit 7decb095ee
5 changed files with 102 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/V1/Client/ClientUpdateRequest.php
View File

@@ -13,7 +13,7 @@ use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
/**
* @property Organization $organization Organization from model binding
* @property Client $client Client from model binding
* @property Client|null $client Client from model binding
*/
class ClientUpdateRequest extends FormRequest
{

2
app/Http/Requests/V1/Project/ProjectUpdateRequest.php
View File

@@ -16,7 +16,7 @@ use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
/**
* @property Organization $organization Organization from model binding
* @property Project $project Project from model binding
* @property Project|null $project Project from model binding
*/
class ProjectUpdateRequest extends FormRequest
{

2
app/Http/Requests/V1/Tag/TagUpdateRequest.php
View File

@@ -13,7 +13,7 @@ use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
/**
* @property Organization $organization Organization from model binding
* @property Tag $tag Tag from model binding
* @property Tag|null $tag Tag from model binding
*/
class TagUpdateRequest extends FormRequest
{

2
app/Http/Requests/V1/Task/TaskUpdateRequest.php
View File

@@ -13,7 +13,7 @@ use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
/**
* @property Organization $organization Organization from model binding
* @property Task $task Task from model binding
* @property Task|null $task Task from model binding
*/
class TaskUpdateRequest extends FormRequest
{

98
tests/Feature/RegistrationTest.php
View File

@@ -5,10 +5,13 @@ declare(strict_types=1);
namespace Tests\Feature;
use App\Enums\Role;
use App\Enums\Weekday;
use App\Events\NewsletterRegistered;
use App\Models\Member;
use App\Models\User;
use App\Providers\RouteServiceProvider;
use App\Service\IpLookup\IpLookupResponseDto;
use App\Service\IpLookup\IpLookupServiceContract;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Event;
use Laravel\Fortify\Features;
@@ -100,6 +103,7 @@ class RegistrationTest extends TestCase
public function test_new_users_can_register_and_frontend_can_send_timezone_for_user(): void
{
// Act
$response = $this->post('/register', [
'name' => 'Test User',
'email' => 'test@example.com',
@@ -109,12 +113,106 @@ class RegistrationTest extends TestCase
'timezone' => 'Europe/Berlin',
]);
// Assert
$this->assertAuthenticated();
$response->assertRedirect(RouteServiceProvider::HOME);
$user = User::where('email', 'test@example.com')->firstOrFail();
$this->assertSame('Europe/Berlin', $user->timezone);
}
public function test_new_users_can_register_and_uses_ip_lookup_service_to_get_information_about_currency_and_start_of_week(): void
{
// Arrange
$this->mock(IpLookupServiceContract::class, function ($mock) {
$mock->shouldReceive('lookup')->andReturn(new IpLookupResponseDto(
'America/New_York',
Weekday::Sunday,
'USD',
));
});
// Act
$response = $this->post('/register', [
'name' => 'Test User',
'email' => 'test@example.com',
'password' => 'password',
'password_confirmation' => 'password',
'terms' => Jetstream::hasTermsAndPrivacyPolicyFeature(),
'timezone' => 'Europe/Berlin',
]);
// Assert
$this->assertAuthenticated();
$response->assertRedirect(RouteServiceProvider::HOME);
/** @var User $user */
$user = User::where('email', 'test@example.com')->firstOrFail();
$this->assertSame('Europe/Berlin', $user->timezone);
$this->assertSame(Weekday::Sunday, $user->week_start);
$this->assertSame('USD', $user->organizations->first()->currency);
}
public function test_new_users_can_register_and_uses_ip_lookup_service_to_get_information_about_timezone_if_client_did_not_send_one(): void
{
// Arrange
$this->mock(IpLookupServiceContract::class, function ($mock) {
$mock->shouldReceive('lookup')->andReturn(new IpLookupResponseDto(
'America/New_York',
Weekday::Sunday,
'USD',
));
});
// Act
$response = $this->post('/register', [
'name' => 'Test User',
'email' => 'test@example.com',
'password' => 'password',
'password_confirmation' => 'password',
'terms' => Jetstream::hasTermsAndPrivacyPolicyFeature(),
'timezone' => null,
]);
// Assert
$this->assertAuthenticated();
$response->assertRedirect(RouteServiceProvider::HOME);
/** @var User $user */
$user = User::where('email', 'test@example.com')->firstOrFail();
$this->assertSame('America/New_York', $user->timezone);
$this->assertSame(Weekday::Sunday, $user->week_start);
$this->assertSame('USD', $user->organizations->first()->currency);
}
public function test_new_users_can_register_and_uses_ip_lookup_service_to_get_information_about_timezone_if_client_sends_invalid_one(): void
{
// Arrange
$this->mock(IpLookupServiceContract::class, function ($mock) {
$mock->shouldReceive('lookup')->andReturn(new IpLookupResponseDto(
'America/New_York',
Weekday::Sunday,
'USD',
));
});
// Act
$response = $this->post('/register', [
'name' => 'Test User',
'email' => 'test@example.com',
'password' => 'password',
'password_confirmation' => 'password',
'terms' => Jetstream::hasTermsAndPrivacyPolicyFeature(),
'timezone' => 'Unknown timezone',
]);
// Assert
$this->assertAuthenticated();
$response->assertRedirect(RouteServiceProvider::HOME);
/** @var User $user */
$user = User::where('email', 'test@example.com')->firstOrFail();
$this->assertSame('America/New_York', $user->timezone);
$this->assertSame(Weekday::Sunday, $user->week_start);
$this->assertSame('USD', $user->organizations->first()->currency);
}
public function test_new_users_can_register_and_ignores_invalid_timezones_from_frontend(): void
{
$response = $this->post('/register', [