MNT Remove polyfill

silverstripe · Nov 4, 2021 · 6d2e588 · 6d2e588
1 parent 3ab86f3
commit 6d2e588
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 23 deletions.
diff --git a/composer.json b/composer.json
@@ -30,7 +30,6 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "dms/phpunit-arraysubset-asserts": "^0.3.0",
         "squizlabs/php_codesniffer": "^3.0"
     },
     "extra": {

diff --git a/tests/ReportAdminTest.php b/tests/ReportAdminTest.php
@@ -5,16 +5,13 @@
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Dev\SapphireTest;
-use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
 use SilverStripe\Reports\Report;
 use SilverStripe\Reports\ReportAdmin;
 use SilverStripe\Reports\Tests\ReportAdminTest\FakeReport;
 use SilverStripe\Reports\Tests\ReportAdminTest\FakeReport2;
 
 class ReportAdminTest extends SapphireTest
 {
-    use ArraySubsetAsserts;
-
     public function testBreadcrumbsAreGenerated()
     {
         $noExtraCrumbs = FakeReport::create();
@@ -23,35 +20,29 @@ public function testBreadcrumbsAreGenerated()
         $breadcrumbs = $controller->BreadCrumbs();
 
         $this->assertCount(2, $breadcrumbs);
+        $map = $breadcrumbs[0]->toMap();
+        $this->assertSame('Reports', $map['Title']);
+        $this->assertSame('admin/reports/', $map['Link']);
 
-        $this->assertArraySubset([
-            'Title' => 'Reports',
-            'Link' => 'admin/reports/',
-        ], $breadcrumbs[0]->toMap(), true, 'Link to top level reports is within breadcrumbs');
-
-        $this->assertArraySubset([
-            'Title' => 'Fake report'
-        ], $breadcrumbs[1]->toMap(), true, 'Current report is within breadcrumbs');
+        $map = $breadcrumbs[1]->toMap();
+        $this->assertSame('Fake report', $map['Title']);
 
         $extraCrumbs = FakeReport2::create();
         $controller = $this->mockController($extraCrumbs);
         $breadcrumbs = $controller->Breadcrumbs();
 
         $this->assertCount(3, $breadcrumbs);
 
-        $this->assertArraySubset([
-            'Title' => 'Reports',
-            'Link' => 'admin/reports/',
-        ], $breadcrumbs[0]->toMap(), true, 'Link to top level reports is within breadcrumbs (again)');
+        $map = $breadcrumbs[0]->toMap();
+        $this->assertSame('Reports', $map['Title']);
+        $this->assertSame('admin/reports', $map['Link']);
 
-        $this->assertArraySubset([
-            'Title' => 'Fake report title',
-            'Link' => 'admin/reports/show/SilverStripe-Reports-Tests-ReportAdminTest-FakeReport',
-        ], $breadcrumbs[1]->toMap(), true, 'Custom breadcrumb appears');
+        $map = $breadcrumbs[1]->toMap();
+        $this->assertSame('Fake report title', $map['Title']);
+        $this->assertSame('admin/reports/show/SilverStripe-Reports-Tests-ReportAdminTest-FakeReport', $map['Link']);
 
-        $this->assertArraySubset([
-            'Title' => 'Fake report two'
-        ], $breadcrumbs[2]->toMap(), true, 'Current report is still within breadcrumbs');
+        $map = $breadcrumbs[2]->toMap();
+        $this->assertSame('Fake report two', $map['Title']);
     }
 
     /**