Merge pull request #12860 from nanaya/remove-array-subset-test

Remove array subset test extension

Author: notbakaneko

composer.json

@@ -48,7 +48,6 @@
   "require-dev": {
     "beyondcode/laravel-query-detector": "*",
     "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
-    "dms/phpunit-arraysubset-asserts": "^0.5.0",
     "laravel/dusk": "*",
     "mockery/mockery": "*",
     "nunomaduro/collision": "^8.1",

composer.lock

@@ -111,7 +111,9 @@ public function testUserGroupChangePlaymodes()
         $actualPlaymodes = $user->findUserGroup($group)->playmodes;
 
         $this->assertCount(count($playmodes), $actualPlaymodes);
-        $this->assertArraySubset($playmodes, $actualPlaymodes);
+        foreach ($playmodes as $ruleset) {
+            $this->assertContains($ruleset, $actualPlaymodes);
+        }
         $this->assertSame(
             $this->eventCount(UserGroupEvent::USER_ADD, $user, $group),
             $userAddEventCount,
@@ -229,7 +231,9 @@ public function testUserGroupSetDefaultLeavesPlaymodesUnchanged()
         $actualPlaymodes = $user->findUserGroup($group)->playmodes;
 
         $this->assertCount(count($playmodes), $actualPlaymodes);
-        $this->assertArraySubset($playmodes, $actualPlaymodes);
+        foreach ($playmodes as $ruleset) {
+            $this->assertContains($ruleset, $actualPlaymodes);
+        }
     }
 
     public function testUserGroupSetDefaultWhenAlreadyDefault()

tests/Controllers/InterOp/UserGroupsControllerTest.php

@@ -27,10 +27,11 @@ public function testUserIsRestricted()
         $user = $this->createUser(['user_warnings' => 1]);
 
         $errors = $user->validateChangeUsername('newusername')->all();
-        $expected = [osu_trans('model_validation.user.change_username.restricted')];
 
-        $this->assertArrayHasKey('username', $errors);
-        $this->assertArraySubset($expected, $errors['username'], true);
+        $this->assertContains(
+            osu_trans('model_validation.user.change_username.restricted'),
+            $errors['username'],
+        );
     }
 
     public function testSupportCanChangeEvenIfUserIsRestricted()
@@ -47,10 +48,11 @@ public function testUserHasNeverSupported()
         $user = $this->createUser(['osu_subscriptionexpiry' => null]);
 
         $errors = $user->validateChangeUsername('newusername')->all();
-        $expected = [ChangeUsername::requireSupportedMessage()];
 
-        $this->assertArrayHasKey('username', $errors);
-        $this->assertArraySubset($expected, $errors['username'], true);
+        $this->assertContains(
+            ChangeUsername::requireSupportedMessage(),
+            $errors['username'],
+        );
     }
 
     public function testSupportCanChangeEvenIfUserHasNeverSupported()
@@ -67,21 +69,23 @@ public function testUsernameIsSame()
         $user = $this->createUser();
 
         $errors = $user->validateChangeUsername('iamuser')->all();
-        $expected = [osu_trans('model_validation.user.change_username.username_is_same')];
 
-        $this->assertArrayHasKey('username', $errors);
-        $this->assertArraySubset($expected, $errors['username'], true);
+        $this->assertContains(
+            osu_trans('model_validation.user.change_username.username_is_same'),
+            $errors['username'],
+        );
     }
 
     public function testUsernameWithDifferentCasingIsSame()
     {
         $user = $this->createUser();
 
         $errors = $user->validateChangeUsername('iAmUser')->all();
-        $expected = [osu_trans('model_validation.user.change_username.username_is_same')];
 
-        $this->assertArrayHasKey('username', $errors);
-        $this->assertArraySubset($expected, $errors['username'], true);
+        $this->assertContains(
+            osu_trans('model_validation.user.change_username.username_is_same'),
+            $errors['username'],
+        );
     }
 
     public function testUserHasSupportedButExpired()

tests/Libraries/ChangeUsernameTest.php

@@ -43,13 +43,11 @@ public function testRequiresUsername()
         $thrown = $this->runSubject($reg);
 
         $this->assertTrue($thrown);
-        $this->assertArraySubset(
-            $reg->user()->validationErrors()->all(),
-            [
-                'username' => [osu_trans('model_validation.required', [
-                    'attribute' => osu_trans('model_validation.user.attributes.username'),
-                ])],
-            ]
+        $this->assertContains(
+            osu_trans('model_validation.required', [
+                'attribute' => osu_trans('model_validation.user.attributes.username'),
+            ]),
+            $reg->user()->validationErrors()->all()['username'],
         );
         $this->assertSame($origCount, User::count());
     }
@@ -64,13 +62,11 @@ public function testStoreRequiresEmail()
         $thrown = $this->runSubject($reg);
 
         $this->assertTrue($thrown);
-        $this->assertArraySubset(
-            $reg->user()->validationErrors()->all(),
-            [
-                'user_email' => [osu_trans('model_validation.required', [
-                    'attribute' => osu_trans('model_validation.user.attributes.user_email'),
-                ])],
-            ]
+        $this->assertContains(
+            osu_trans('model_validation.required', [
+                'attribute' => osu_trans('model_validation.user.attributes.user_email'),
+            ]),
+            $reg->user()->validationErrors()->all()['user_email'],
         );
         $this->assertSame($origCount, User::count());
     }
@@ -85,13 +81,11 @@ public function testStoreRequiresPassword()
         $thrown = $this->runSubject($reg);
 
         $this->assertTrue($thrown);
-        $this->assertArraySubset(
-            $reg->user()->validationErrors()->all(),
-            [
-                'password' => [osu_trans('model_validation.required', [
-                    'attribute' => osu_trans('model_validation.user.attributes.password'),
-                ])],
-            ]
+        $this->assertContains(
+            osu_trans('model_validation.required', [
+                'attribute' => osu_trans('model_validation.user.attributes.password'),
+            ]),
+            $reg->user()->validationErrors()->all()['password'],
         );
         $this->assertSame($origCount, User::count());
     }

tests/Libraries/UserRegistrationTest.php

@@ -22,7 +22,6 @@
 use App\Models\User;
 use Artisan;
 use Carbon\CarbonInterface;
-use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
 use Illuminate\Database\DatabaseManager;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -36,7 +35,7 @@
 
 class TestCase extends BaseTestCase
 {
-    use ArraySubsetAsserts, CreatesApplication, DatabaseTransactions;
+    use CreatesApplication, DatabaseTransactions;
 
     protected $connectionsToTransact = [
         'mysql',