test: Move code to RoutesTest.php

codeigniter4 · Nov 8, 2023 · 4e872f7 · 4e872f7
1 parent 231a748
commit 4e872f7
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 45 deletions.
diff --git a/tests/system/Commands/RoutesTest.php b/tests/system/Commands/RoutesTest.php
@@ -223,4 +223,32 @@ public function testRoutesCommandRouteLegacy(): void
             EOL;
         $this->assertStringContainsString($expected, $this->getBuffer());
     }
+
+    public function testRoutesCommandWithAnyLocales(): void
+    {
+        $routes = $this->getCleanRoutes();
+        $routes->useSupportedLocalesOnly(false);
+        $routes->get('{locale}/admin/(:segment)', 'AdminController::index/$1', ['as' => 'admin']);
+
+        command('routes');
+
+        $expected = <<<'EOL'
+            | GET     | {locale}/admin/([^/]+) | admin         | \App\Controllers\AdminController::index/$1 |                | toolbar       |
+            EOL;
+        $this->assertStringContainsString($expected, $this->getBuffer());
+    }
+
+    public function testRoutesCommandWithSupportedLocalesOnly(): void
+    {
+        $routes = $this->getCleanRoutes();
+        $routes->useSupportedLocalesOnly(true);
+        $routes->get('{locale}/admin/(:segment)', 'AdminController::index/$1', ['as' => 'admin']);
+
+        command('routes');
+
+        $expected = <<<'EOL'
+            | GET     | {locale}/admin/([^/]+) | admin         | \App\Controllers\AdminController::index/$1 |                | !toolbar      |
+            EOL;
+        $this->assertStringContainsString($expected, $this->getBuffer());
+    }
 }
diff --git a/tests/system/Commands/Utilities/Routes/FilterFinderTest.php b/tests/system/Commands/Utilities/Routes/FilterFinderTest.php
@@ -52,13 +52,6 @@ protected function setUp(): void
         $this->moduleConfig->enabled = false;
     }
 
-    protected function tearDown(): void
-    {
-        parent::tearDown();
-
-        $this->resetServices();
-    }
-
     private function createRouteCollection(array $routes = []): RouteCollection
     {
         $collection = new RouteCollection(Services::locator(), $this->moduleConfig, new Routing());
@@ -321,42 +314,4 @@ public function testFilterOrderWithOldFilterOrder()
         ];
         $this->assertSame($expected, $filters);
     }
-
-    public function testFindFiltersWithAnyLocales(): void
-    {
-        $collection = $this->createRouteCollection();
-        $collection->useSupportedLocalesOnly(false);
-        $collection->get('{locale}/admin/(:segment)', 'AdminController::index/$1');
-        Services::injectMock('routes', $collection);
-        $router  = $this->createRouter($collection);
-        $filters = $this->createFilters();
-        $finder  = new FilterFinder($router, $filters);
-
-        $filters = $finder->find('{locale}/admin/settings');
-
-        $expected = [
-            'before' => ['csrf'],
-            'after'  => ['toolbar'],
-        ];
-        $this->assertSame($expected, $filters);
-    }
-
-    public function testFindFiltersWithSupportedLocalesOnly(): void
-    {
-        $collection = $this->createRouteCollection();
-        $collection->useSupportedLocalesOnly(true);
-        $collection->get('{locale}/admin/(:segment)', 'AdminController::index/$1');
-        Services::injectMock('routes', $collection);
-        $router  = $this->createRouter($collection);
-        $filters = $this->createFilters();
-        $finder  = new FilterFinder($router, $filters);
-
-        $filters = $finder->find('{locale}/admin/settings');
-
-        $expected = [
-            'before' => ['!csrf'],
-            'after'  => ['!toolbar'],
-        ];
-        $this->assertSame($expected, $filters);
-    }
 }