test: fix tests (wip)

Author: kenjis

tests/system/RESTful/ResourceControllerTest.php

@@ -50,7 +50,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->resetServices();
+        $this->resetServices(true);
+        $this->resetFactories();
     }
 
     private function createCodeigniter(): void
@@ -92,7 +93,8 @@ public function testResourceGet()
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['index']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['index']), $error);
     }
 
     public function testResourceGetNew()
@@ -113,7 +115,8 @@ public function testResourceGetNew()
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['new']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['new']), $error);
     }
 
     public function testResourceGetEdit()
@@ -135,7 +138,8 @@ public function testResourceGetEdit()
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['edit']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['edit']), $error);
     }
 
     public function testResourceGetOne()
@@ -156,7 +160,8 @@ public function testResourceGetOne()
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['show']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['show']), $error);
     }
 
     public function testResourcePost()
@@ -176,7 +181,8 @@ public function testResourcePost()
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['create']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['create']), $error);
     }
 
     public function testResourcePatch()
@@ -197,7 +203,8 @@ public function testResourcePatch()
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['patch']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['update']), $error);
     }
 
     public function testResourcePut()
@@ -218,7 +225,8 @@ public function testResourcePut()
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['put']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['update']), $error);
     }
 
     public function testResourceDelete()
@@ -239,7 +247,8 @@ public function testResourceDelete()
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['delete']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['delete']), $error);
     }
 
     public function testModel()

tests/system/RESTful/ResourcePresenterTest.php

@@ -44,7 +44,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->resetServices();
+        $this->resetServices(true);
+        $this->resetFactories();
     }
 
     private function createCodeigniter(): void

tests/system/Router/RouteCollectionTest.php

@@ -26,7 +26,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->resetServices();
+        $this->resetServices(true);
+        $this->resetFactories();
     }
 
     protected function getCollector(array $config = [], array $files = [], $moduleConfig = null)
@@ -1661,6 +1662,7 @@ public function testAutoRoutesControllerNameReturnsFQCN($namespace)
      */
     public function testRoutesControllerNameReturnsFQCN($namespace)
     {
+        Services::request()->setMethod('get');
         $routes = $this->getCollector();
         $routes->setAutoRoute(false);
         $routes->setDefaultNamespace($namespace);