CsrfProtectionMiddlewareを有効化したことによりテストが失敗していたので調整

catchup-doi · May 5, 2021 · 50ca3e7 · 50ca3e7
1 parent 5f4fde4
commit 50ca3e7
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 80 deletions.
diff --git a/plugins/baser-core/config/bootstrap.php b/plugins/baser-core/config/bootstrap.php
@@ -36,11 +36,14 @@
 
 /**
  * キャッシュ設定
+ * ユニットテスト時に重複して設定するとエラーとなるため判定を入れている
  */
-if (Configure::read('debug')) {
-    Configure::write('Cache._bc_env_.duration', '+2 seconds');
+if (!Cache::getConfig('_bc_env_')) {
+    if (Configure::read('debug')) {
+        Configure::write('Cache._bc_env_.duration', '+2 seconds');
+    }
+    Cache::setConfig(Configure::consume('Cache'));
 }
-Cache::setConfig(Configure::consume('Cache'));
 
 /**
  * デフォルトバリデーションプロバイダー

diff --git a/plugins/baser-core/src/BcApplication.php b/plugins/baser-core/src/BcApplication.php
diff --git a/plugins/baser-core/src/Controller/Admin/PluginsController.php b/plugins/baser-core/src/Controller/Admin/PluginsController.php
@@ -139,7 +139,7 @@ public function install($name)
         $this->setTitle(__d('baser', '新規プラグイン登録'));
         $this->setHelp('plugins_install');
 
-        if (!$isInstallable || !$this->request->is('post')) {
+        if (!$isInstallable || !$this->request->is('put')) {
             return;
         }
 

diff --git a/plugins/baser-core/tests/TestCase/Controller/PasswordRequestsControllerTest.php b/plugins/baser-core/tests/TestCase/Controller/PasswordRequestsControllerTest.php
@@ -53,10 +53,12 @@ public function testEntry()
         $messages = TestEmailTransport::clearMessages();
 
         $this->enableSecurityToken();
+        $this->enableCsrfToken();
 
         $this->get('/baser/admin/password_requests/entry');
         $this->assertResponseOk();
 
+
         // メールアドレス送信
         $this->post('/baser/admin/password_requests/entry', [
             'email' => '[email protected]',

diff --git a/plugins/baser-core/tests/TestCase/Controller/PluginsControllerTest.php b/plugins/baser-core/tests/TestCase/Controller/PluginsControllerTest.php
@@ -108,12 +108,12 @@ public function testAjax_delete_file()
     public function testDetachAndInstallAndUninstall(): void
     {
         $this->enableSecurityToken();
+        $this->enableCsrfToken();
         $this->post('/baser/admin/plugins/detach/BcSample');
         $this->assertFlashMessage('プラグインの無効化に失敗しました。');
         $this->post('/baser/admin/plugins/detach/BcBlog');
         $this->assertFlashMessage('プラグイン「BcBlog」を無効にしました。');
 
-        $this->enableSecurityToken();
         $this->put('/baser/admin/plugins/install/BcBlog', ['connection' => 'test']);
         $this->assertRedirect([
             'plugin' => 'BaserCore',
@@ -161,6 +161,7 @@ public function test_addPermission()
     public function testReset_db()
     {
         $this->enableSecurityToken();
+        $this->enableCsrfToken();
         $this->put('/baser/admin/plugins/reset_db/BcBlog', ['connection' => 'test', 'name' => 'BcBlog']);
         $this->assertRedirect([
             'plugin' => 'BaserCore',

diff --git a/plugins/baser-core/tests/TestCase/Controller/UserGroupsControllerTest.php b/plugins/baser-core/tests/TestCase/Controller/UserGroupsControllerTest.php
@@ -84,7 +84,7 @@ public function testIndex_pagination()
     public function testAdd()
     {
         $this->enableSecurityToken();
-
+        $this->enableCsrfToken();
         $this->get('/baser/admin/user_groups/add');
         $this->assertResponseOk();
 
@@ -135,6 +135,7 @@ public function testDelete()
     public function testCopy()
     {
         $this->enableSecurityToken();
+        $this->enableCsrfToken();
         $this->post('/baser/admin/user_groups/copy/1');
         $this->assertResponseSuccess();
         $userGroups = $this->getTableLocator()->get('UserGroups');

diff --git a/plugins/baser-core/tests/TestCase/Controller/UsersControllerTest.php b/plugins/baser-core/tests/TestCase/Controller/UsersControllerTest.php
@@ -84,6 +84,7 @@ public function testIndex_pagination()
     public function testAdd()
     {
         $this->enableSecurityToken();
+        $this->enableCsrfToken();
         $data = [
             'name' => 'Test_test_Man',
             'password_1' => 'Lorem ipsum dolor sit amet',

diff --git a/plugins/baser-core/tests/TestCase/Model/Table/PasswordRequestsTableTest.php b/plugins/baser-core/tests/TestCase/Model/Table/PasswordRequestsTableTest.php
@@ -156,6 +156,7 @@ public function testUpdatePassword()
 
         // 変更後のパスワードでログイン
         $this->enableSecurityToken();
+        $this->enableCsrfToken();
         $this->post(Configure::read('BcPrefixAuth.Admin.loginAction'), [
             'email' => '[email protected]',
             'password' => 'test'