Merge pull request #67 from deniskorbakov/update-test-coverage

Update test coverage

Author: deniskorbakov

app/Builders/UserBuilder.php

@@ -10,11 +10,6 @@
 /** @extends Builder<User> */
 class UserBuilder extends Builder
 {
-    public function hasRole(string $role): bool
-    {
-        return $this->where('role', $role)->exists();
-    }
-
     public function isEmailVerified(): bool
     {
         return $this->model->email_verified_at !== null;

app/Models/User.php

@@ -24,7 +24,6 @@
  * @property ?Carbon $email_verified_at
  * @property UserRole $role
  *
- * @method hasRole(string $role)
  * @method isEmailVerified()
  */
 class User extends Authenticatable implements FilamentUser

app/Providers/HorizonServiceProvider.php

@@ -24,7 +24,7 @@ public function boot(): void
      */
     protected function gate(): void
     {
-        Gate::define('viewHorizon', function ($user): bool {
+        Gate::define('viewHorizon', static function ($user): bool {
             return in_array($user->email, [
                 //
             ]);

composer.json

@@ -89,7 +89,7 @@
     "cs-rector-fix": [
       "@php vendor/bin/rector"
     ],
-    "test-coverage": "@php vendor/bin/pest --coverage --min=80",
+    "test-coverage": "@php vendor/bin/pest --coverage --min=90",
     "tests": [
       "@php vendor/bin/pest"
     ]

rector.php

@@ -32,67 +32,67 @@
 use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector;
 use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector;
 use Rector\ValueObject\PhpVersion;
-use RectorLaravel\Rector\StaticCall\MinutesToSecondsInCacheRector;
 use RectorLaravel\Set\LaravelLevelSetList;
 
 return static function (RectorConfig $rectorConfig): void {
-    // Paths to analyze
-    $rectorConfig->paths([
-                             __DIR__ . '/app',
-                             __DIR__ . '/config',
-                             __DIR__ . '/database',
-                             __DIR__ . '/routes',
-                             __DIR__ . '/tests',
-                         ]);
+    $rectorConfig->paths(
+        [
+            __DIR__ . '/app',
+            __DIR__ . '/config',
+            __DIR__ . '/database',
+            __DIR__ . '/routes',
+            __DIR__ . '/tests',
+        ]
+    );
 
-    $rectorConfig->rules([
-                             AddVoidReturnTypeWhereNoReturnRector::class,
-                             DeclareStrictTypesRector::class,
-                             ClosureReturnTypeRector::class,
-                             ReturnTypeFromStrictTypedCallRector::class,
-                             ReturnTypeFromStrictNewArrayRector::class,
-                             ReturnTypeFromReturnDirectArrayRector::class,
-                             TypedPropertyFromStrictConstructorRector::class,
-                             CompleteDynamicPropertiesRector::class,
-                             InlineArrayReturnAssignRector::class,
-                             ExplicitBoolCompareRector::class,
-                             SwitchNegatedTernaryRector::class,
-                             NewlineBeforeNewAssignSetRector::class,
-                             EncapsedStringsToSprintfRector::class,
-                             PostIncDecToPreIncDecRector::class,
-                             SymplifyQuoteEscapeRector::class,
-                             RemoveUnusedPromotedPropertyRector::class,
-                             RemoveUnusedPrivateMethodRector::class,
-                             RemoveUnusedPrivatePropertyRector::class,
-                             ClassPropertyAssignToConstructorPromotionRector::class,
-                             ReadOnlyPropertyRector::class,
-                             PrivatizeFinalClassMethodRector::class,
-                             PrivatizeFinalClassPropertyRector::class,
-                         ]);
+    $rectorConfig->rules(
+        [
+            AddVoidReturnTypeWhereNoReturnRector::class,
+            DeclareStrictTypesRector::class,
+            ClosureReturnTypeRector::class,
+            ReturnTypeFromStrictTypedCallRector::class,
+            ReturnTypeFromStrictNewArrayRector::class,
+            ReturnTypeFromReturnDirectArrayRector::class,
+            TypedPropertyFromStrictConstructorRector::class,
+            CompleteDynamicPropertiesRector::class,
+            InlineArrayReturnAssignRector::class,
+            ExplicitBoolCompareRector::class,
+            SwitchNegatedTernaryRector::class,
+            NewlineBeforeNewAssignSetRector::class,
+            EncapsedStringsToSprintfRector::class,
+            PostIncDecToPreIncDecRector::class,
+            SymplifyQuoteEscapeRector::class,
+            RemoveUnusedPromotedPropertyRector::class,
+            RemoveUnusedPrivateMethodRector::class,
+            RemoveUnusedPrivatePropertyRector::class,
+            ClassPropertyAssignToConstructorPromotionRector::class,
+            ReadOnlyPropertyRector::class,
+            PrivatizeFinalClassMethodRector::class,
+            PrivatizeFinalClassPropertyRector::class,
+        ]
+    );
 
-    // Skip specific rules
-    $rectorConfig->skip([
-                            CompactToVariablesRector::class,
-                            RemoveEmptyClassMethodRector::class,
-                            RemoveNonExistingVarAnnotationRector::class,
-                            MinutesToSecondsInCacheRector::class,
-                            RemoveNullArgOnNullDefaultParamRector::class,
-                            __DIR__ . '/app/Http/Controllers/Auth/AuthenticatedSessionController.php',
-                        ]);
+    $rectorConfig->skip(
+        [
+            CompactToVariablesRector::class,
+            RemoveEmptyClassMethodRector::class,
+            RemoveNonExistingVarAnnotationRector::class,
+            RemoveNullArgOnNullDefaultParamRector::class,
+        ]
+    );
 
-    // Enable caching for Rector
     $rectorConfig->cacheDirectory(__DIR__ . '/storage/rector');
     $rectorConfig->cacheClass(FileCacheStorage::class);
 
-    // Apply sets for Laravel and general code quality
-    $rectorConfig->sets([
-                            LaravelLevelSetList::UP_TO_LARAVEL_110,
-                            SetList::CODE_QUALITY,
-                            SetList::TYPE_DECLARATION,
-                            SetList::DEAD_CODE,
-                            SetList::PRIVATIZATION,
-                        ]);
+    $rectorConfig->sets(
+        [
+            LaravelLevelSetList::UP_TO_LARAVEL_120,
+            SetList::CODE_QUALITY,
+            SetList::TYPE_DECLARATION,
+            SetList::DEAD_CODE,
+            SetList::PRIVATIZATION,
+        ]
+    );
 
-    // Define PHP version for Rector
     $rectorConfig->phpVersion(PhpVersion::PHP_84);
 };

tests/Feature/User/RolesTest.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Enums\UserRole;
+use App\Models\User;
+
+test('success - get public roles', function (): void {
+    $user = User::factory()->create();
+
+    $result = $this->actingAsApi($user)
+        ->getJson(route('roles'));
+
+    $result->assertOk()
+        ->assertJsonStructure(
+            [
+                'roles' => [
+                    '*' => [
+                        'id',
+                        'name',
+                    ],
+                ],
+            ]
+        );
+
+    $roles = $result->json('roles');
+
+    expect($roles)->toHaveCount(1)
+        ->and($roles[0]['id'])->toBe(UserRole::User->value)
+        ->and($roles[0]['name'])->toBe(UserRole::User->displayName());
+});
+
+test('success - roles structure and content', function (): void {
+    $user = User::factory()->create();
+
+    $result = $this->actingAsApi($user)
+        ->getJson(route('roles'));
+
+    $roles = $result->json('roles');
+
+    expect($roles)->toHaveCount(1)
+        ->and($roles[0])->toEqual(
+            [
+                'id'   => 'user',
+                'name' => 'Пользователь',
+            ]
+        );
+});

tests/Unit/Enum/UserRoleTest.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Enums\UserRole;
+
+test('success - enum has correct cases', function (): void {
+    $cases = UserRole::cases();
+
+    expect($cases)->toHaveCount(3)
+        ->and($cases[0]->name)->toBe('Developer')
+        ->and($cases[0]->value)->toBe('developer')
+        ->and($cases[1]->name)->toBe('Admin')
+        ->and($cases[1]->value)->toBe('admin')
+        ->and($cases[2]->name)->toBe('User')
+        ->and($cases[2]->value)->toBe('user');
+});
+
+test('success - enum displayName returns correct translations', function (): void {
+    expect(UserRole::Developer->displayName())->toBe('Разработчик')
+        ->and(UserRole::Admin->displayName())->toBe('Администратор')
+        ->and(UserRole::User->displayName())->toBe('Пользователь');
+});
+
+test('success - enum canFullAccess returns correct bool', function (): void {
+    expect(UserRole::Developer->canFullAccess())->toBeTrue()
+        ->and(UserRole::Admin->canFullAccess())->toBeTrue()
+        ->and(UserRole::User->canFullAccess())->toBeFalse();
+});
+
+test('success - enum publicRoles returns correct roles', function (): void {
+    $publicRoles = UserRole::publicRoles();
+
+    expect($publicRoles)->toHaveCount(1)
+        ->and($publicRoles[0])->toBe(UserRole::User);
+});