Fix tests, update baseline.

canyongbs · Jan 24, 2024 · ef2803a · ef2803a
1 parent 0a31cdb
commit ef2803a
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 49 deletions.
diff --git a/app-modules/knowledge-base/tests/KnowledgeBaseItem/EditKnowledgeBaseItemTest.php b/app-modules/knowledge-base/tests/KnowledgeBaseItem/EditKnowledgeBaseItemTest.php
@@ -35,6 +35,9 @@
 */
 
 use App\Models\User;
+
+use function Pest\Laravel\get;
+
 use App\Settings\LicenseSettings;
 
 use function Pest\Laravel\actingAs;
@@ -59,7 +62,7 @@
 
     $knowledgeBaseItem = KnowledgeBaseItem::factory()->create();
 
-    $this->get(
+    get(
         KnowledgeBaseItemResource::getUrl('edit', [
             'record' => $knowledgeBaseItem,
         ])
@@ -73,7 +76,7 @@
     $user->givePermissionTo('knowledge_base_item.view-any');
     $user->givePermissionTo('knowledge_base_item.*.update');
 
-    $this->get(
+    get(
         KnowledgeBaseItemResource::getUrl('edit', [
             'record' => $knowledgeBaseItem,
         ])
@@ -98,7 +101,7 @@
 
     $knowledgeBaseItem = KnowledgeBaseItem::factory()->create();
 
-    $this->get(
+    get(
         KnowledgeBaseItemResource::getUrl('edit', [
             'record' => $knowledgeBaseItem,
         ])
@@ -113,7 +116,7 @@
 
     $settings->save();
 
-    $this->get(
+    get(
         KnowledgeBaseItemResource::getUrl('edit', [
             'record' => $knowledgeBaseItem,
         ])

diff --git a/app-modules/knowledge-base/tests/KnowledgeBaseItem/ListKnowledgeBaseItemsTest.php b/app-modules/knowledge-base/tests/KnowledgeBaseItem/ListKnowledgeBaseItemsTest.php
@@ -35,6 +35,9 @@
 */
 
 use App\Models\User;
+
+use function Pest\Laravel\get;
+
 use App\Settings\LicenseSettings;
 
 use function Pest\Laravel\actingAs;
@@ -69,19 +72,19 @@
 
     $user->givePermissionTo('knowledge_base_item.view-any');
 
-    actingAs($user)
-        ->get(
-            KnowledgeBaseItemResource::getUrl('index')
-        )->assertForbidden();
+    actingAs($user);
+
+    get(
+        KnowledgeBaseItemResource::getUrl('index')
+    )->assertForbidden();
 
     $settings->data->addons->knowledgeManagement = true;
 
     $settings->save();
 
-    actingAs($user)
-        ->get(
-            KnowledgeBaseItemResource::getUrl('index')
-        )->assertSuccessful();
+    get(
+        KnowledgeBaseItemResource::getUrl('index')
+    )->assertSuccessful();
 });
 
 test('ListKnowledgeBaseItems is gated with proper license access control', function () {
@@ -99,17 +102,17 @@
     $user->givePermissionTo('knowledge_base_item.view-any');
 
     // They should not be able to access the resource
-    actingAs($user)
-        ->get(
-            KnowledgeBaseItemResource::getUrl('index')
-        )->assertForbidden();
+    actingAs($user);
+
+    get(
+        KnowledgeBaseItemResource::getUrl('index')
+    )->assertForbidden();
 
     $user->grantLicense(LicenseType::RecruitmentCrm);
 
     $user->refresh();
 
-    actingAs($user)
-        ->get(
-            KnowledgeBaseItemResource::getUrl('index')
-        )->assertSuccessful();
+    get(
+        KnowledgeBaseItemResource::getUrl('index')
+    )->assertSuccessful();
 });
diff --git a/app-modules/knowledge-base/tests/KnowledgeBaseItem/ViewKnowledgeBaseItemTest.php b/app-modules/knowledge-base/tests/KnowledgeBaseItem/ViewKnowledgeBaseItemTest.php
@@ -35,6 +35,9 @@
 */
 
 use App\Models\User;
+
+use function Pest\Laravel\get;
+
 use App\Settings\LicenseSettings;
 
 use function Pest\Laravel\actingAs;
@@ -53,22 +56,22 @@
 
     $knowledgeBaseItem = KnowledgeBaseItem::factory()->create();
 
-    actingAs($user)
-        ->get(
-            KnowledgeBaseItemResource::getUrl('view', [
-                'record' => $knowledgeBaseItem,
-            ])
-        )->assertForbidden();
+    actingAs($user);
+
+    get(
+        KnowledgeBaseItemResource::getUrl('view', [
+            'record' => $knowledgeBaseItem,
+        ])
+    )->assertForbidden();
 
     $user->givePermissionTo('knowledge_base_item.view-any');
     $user->givePermissionTo('knowledge_base_item.*.view');
 
-    actingAs($user)
-        ->get(
-            KnowledgeBaseItemResource::getUrl('view', [
-                'record' => $knowledgeBaseItem,
-            ])
-        )->assertSuccessful();
+    get(
+        KnowledgeBaseItemResource::getUrl('view', [
+            'record' => $knowledgeBaseItem,
+        ])
+    )->assertSuccessful();
 });
 
 test('ViewKnowledgeBaseItem is gated with proper feature access control', function () {
@@ -85,21 +88,21 @@
 
     $knowledgeBaseItem = KnowledgeBaseItem::factory()->create();
 
-    actingAs($user)
-        ->get(
-            KnowledgeBaseItemResource::getUrl('view', [
-                'record' => $knowledgeBaseItem,
-            ])
-        )->assertForbidden();
+    actingAs($user);
+
+    get(
+        KnowledgeBaseItemResource::getUrl('view', [
+            'record' => $knowledgeBaseItem,
+        ])
+    )->assertForbidden();
 
     $settings->data->addons->knowledgeManagement = true;
 
     $settings->save();
 
-    actingAs($user)
-        ->get(
-            KnowledgeBaseItemResource::getUrl('view', [
-                'record' => $knowledgeBaseItem,
-            ])
-        )->assertSuccessful();
+    get(
+        KnowledgeBaseItemResource::getUrl('view', [
+            'record' => $knowledgeBaseItem,
+        ])
+    )->assertSuccessful();
 });
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -4,8 +4,3 @@ parameters:
 			message: "#^Class Mockery_3_App_Models_User not found\\.$#"
 			count: 1
 			path: app-modules/authorization/tests/Feature/Actions/CreatePermissionsForModelTest.php
-
-		-
-			message: "#^Undefined variable\\: \\$this$#"
-			count: 4
-			path: app-modules/knowledge-base/tests/KnowledgeBaseItem/EditKnowledgeBaseItemTest.php