Merge pull request #894 from nishimura-d/test-debug

Make tests stable against debug mode.
cakephp · Apr 2, 2022 · 0b2a1e7 · 0b2a1e7
2 parents bdb65d0 + 44658f3
commit 0b2a1e7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 21 deletions.
diff --git a/tests/TestCase/ApplicationTest.php b/tests/TestCase/ApplicationTest.php
@@ -17,6 +17,7 @@
 namespace App\Test\TestCase;
 
 use App\Application;
+use Cake\Core\Configure;
 use Cake\Error\Middleware\ErrorHandlerMiddleware;
 use Cake\Http\MiddlewareQueue;
 use Cake\Routing\Middleware\AssetMiddleware;
@@ -33,19 +34,35 @@ class ApplicationTest extends TestCase
     use IntegrationTestTrait;
 
     /**
-     * testBootstrap
+     * Test bootstrap in production.
      *
      * @return void
      */
     public function testBootstrap()
     {
+        Configure::write('debug', false);
         $app = new Application(dirname(dirname(__DIR__)) . '/config');
         $app->bootstrap();
         $plugins = $app->getPlugins();
 
-        $this->assertTrue($plugins->has('Bake'), 'plugins has Bake');
-        $this->assertTrue($plugins->has('DebugKit'), 'plugins has DebugKit');
-        $this->assertTrue($plugins->has('Migrations'), 'plugins has Migrations');
+        $this->assertTrue($plugins->has('Bake'), 'plugins has Bake?');
+        $this->assertFalse($plugins->has('DebugKit'), 'plugins has DebugKit?');
+        $this->assertTrue($plugins->has('Migrations'), 'plugins has Migrations?');
+    }
+
+    /**
+     * Test bootstrap add DebugKit plugin in debug mode.
+     *
+     * @return void
+     */
+    public function testBootstrapInDebug()
+    {
+        Configure::write('debug', true);
+        $app = new Application(dirname(dirname(__DIR__)) . '/config');
+        $app->bootstrap();
+        $plugins = $app->getPlugins();
+
+        $this->assertTrue($plugins->has('DebugKit'), 'plugins has DebugKit?');
     }
 
     /**

diff --git a/tests/TestCase/Controller/PagesControllerTest.php b/tests/TestCase/Controller/PagesControllerTest.php
@@ -17,6 +17,7 @@
 namespace App\Test\TestCase\Controller;
 
 use Cake\Core\Configure;
+use Cake\TestSuite\Constraint\Response\StatusCode;
 use Cake\TestSuite\IntegrationTestTrait;
 use Cake\TestSuite\TestCase;
 
@@ -29,26 +30,14 @@ class PagesControllerTest extends TestCase
 {
     use IntegrationTestTrait;
 
-    /**
-     * testMultipleGet method
-     *
-     * @return void
-     */
-    public function testMultipleGet()
-    {
-        $this->get('/');
-        $this->assertResponseOk();
-        $this->get('/');
-        $this->assertResponseOk();
-    }
-
     /**
      * testDisplay method
      *
      * @return void
      */
     public function testDisplay()
     {
+        Configure::write('debug', true);
         $this->get('/pages/home');
         $this->assertResponseOk();
         $this->assertResponseContains('CakePHP');
@@ -120,7 +109,7 @@ public function testCsrfAppliedOk()
         $this->enableCsrfToken();
         $this->post('/pages/home', ['hello' => 'world']);
 
-        $this->assertResponseCode(200);
-        $this->assertResponseContains('CakePHP');
+        $this->assertThat(403, $this->logicalNot(new StatusCode($this->_response)));
+        $this->assertResponseNotContains('CSRF');
     }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -29,8 +29,6 @@
 
 require dirname(__DIR__) . '/config/bootstrap.php';
 
-$_SERVER['PHP_SELF'] = '/';
-
 if (empty($_SERVER['HTTP_HOST'])) {
     Configure::write('App.fullBaseUrl', 'http://localhost');
 }