make some tests pass

eveseat · Aug 21, 2024 · 0896b6b · 0896b6b
1 parent 3f2c58f
commit 0896b6b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/src/Http/Composers/CharacterFilter.php b/src/Http/Composers/CharacterFilter.php
@@ -33,12 +33,11 @@ public function compose(View $view)
         // work with raw arrays since the filter code requires an array of objects, and laravel collections don't like to give us that
         $newrules = [];
         foreach ($rules as $rule) {
+            // convert route names to urls, but keep arrays with hardcoded options
             if(is_string($rule['src'])){
                 $rule['src'] = route($rule['src']);
             }
-
             $newrules[] = (object) $rule;
-
         }
 
         $view->with('characterFilterRules', $newrules);

diff --git a/tests/Acl/AlliancePolicyTest.php b/tests/Acl/AlliancePolicyTest.php
@@ -149,6 +149,9 @@ public function testAlliancePermissionsAsWildcard()
      */
     public function testAlliancePermissionsAsDelegatedCharacter()
     {
+        // make sure this doesn't generate observer events that trigger the squads logic
+        CharacterAffiliation::unsetEventDispatcher();
+
         $permissions = array_keys(require __DIR__ . '/../../src/Config/Permissions/alliance.php');
 
         $user = User::factory()->create();
@@ -199,6 +202,9 @@ public function testAlliancePermissionsAsDelegatedCharacter()
      */
     public function testAlliancePermissionsAsDelegatedCorporation()
     {
+        // make sure this doesn't generate observer events that trigger the squads logic
+        CharacterAffiliation::unsetEventDispatcher();
+
         $permissions = array_keys(require __DIR__ . '/../../src/Config/Permissions/alliance.php');
 
         $user = User::factory()->create();

diff --git a/tests/Acl/CharacterPolicyTest.php b/tests/Acl/CharacterPolicyTest.php
@@ -258,6 +258,9 @@ public function testCharacterPermissionsAsDelegatedCharacter()
      */
     public function testCharacterPermissionsAsDelegatedCorporation()
     {
+        // make sure this doesn't generate observer events that trigger the squads logic
+        CharacterAffiliation::unsetEventDispatcher();
+
         $permissions = array_keys(require __DIR__ . '/../../src/Config/Permissions/character.php');
 
         $user = User::factory()->create();
@@ -313,6 +316,9 @@ public function testCharacterPermissionsAsDelegatedCorporation()
      */
     public function testCharacterPermissionsAsDelegatedAlliance()
     {
+        // make sure this doesn't generate observer events that trigger the squads logic
+        CharacterAffiliation::unsetEventDispatcher();
+
         $permissions = array_keys(require __DIR__ . '/../../src/Config/Permissions/character.php');
 
         $user = User::factory()->create();

diff --git a/tests/Acl/CorporationPolicyTest.php b/tests/Acl/CorporationPolicyTest.php
@@ -186,6 +186,9 @@ public function testCorporationPermissionsAsWildcard()
      */
     public function testCorporationPermissionsAsDelegatedCharacter()
     {
+        // make sure this doesn't generate observer events that trigger the squads logic
+        CharacterAffiliation::unsetEventDispatcher();
+
         $permissions = array_keys(require __DIR__ . '/../../src/Config/Permissions/corporation.php');
 
         $user = User::factory()->create();