From 3fc80e63f57a9f4e13c75a81432c3d0b06b25f24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90=E1=BB=97=20V=C4=83n=20H=C3=B9ng?=
 <dovanhungk57@gmail.com>
Date: Thu, 26 Oct 2023 08:56:05 +0700
Subject: [PATCH] =?UTF-8?q?=E3=83=A6=E3=83=8B=E3=83=83=E3=83=88=E3=83=86?=
 =?UTF-8?q?=E3=82=B9=E3=83=88=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tests/Scenario/CustomTablesScenario.php   | 11 ----------
 .../Front/CustomContentsFrontServiceTest.php  | 22 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/plugins/bc-custom-content/tests/Scenario/CustomTablesScenario.php b/plugins/bc-custom-content/tests/Scenario/CustomTablesScenario.php
index 0c5fe8c331..d64bf6f91c 100644
--- a/plugins/bc-custom-content/tests/Scenario/CustomTablesScenario.php
+++ b/plugins/bc-custom-content/tests/Scenario/CustomTablesScenario.php
@@ -27,17 +27,6 @@ class CustomTablesScenario implements FixtureScenarioInterface
      */
     public function load(...$args)
     {
-        PluginFactory::make(  [
-            'name' => 'BcCustomContent',
-            'title' => 'カスタムコンテンツ',
-            'version' => '1.0.0',
-            'status' => '1',
-            'db_init' => '1',
-            'priority' => '1',
-            'created' => '2021-05-03 10:57:07',
-            'modified' => '2021-05-03 10:57:07'
-        ]);
-
         CustomTableFactory::make([
             'id' => 1,
             'type' => 1,
diff --git a/plugins/bc-custom-content/tests/TestCase/Service/Front/CustomContentsFrontServiceTest.php b/plugins/bc-custom-content/tests/TestCase/Service/Front/CustomContentsFrontServiceTest.php
index 42074dd9f7..f9579d4f87 100644
--- a/plugins/bc-custom-content/tests/TestCase/Service/Front/CustomContentsFrontServiceTest.php
+++ b/plugins/bc-custom-content/tests/TestCase/Service/Front/CustomContentsFrontServiceTest.php
@@ -13,6 +13,7 @@
 
 
 use BaserCore\Service\BcDatabaseServiceInterface;
+use BaserCore\Test\Factory\PluginFactory;
 use BaserCore\Test\Scenario\InitAppScenario;
 use BaserCore\TestSuite\BcTestCase;
 use BaserCore\Utility\BcContainerTrait;
@@ -24,6 +25,7 @@
 use BcCustomContent\Service\Front\CustomContentFrontServiceInterface;
 use BcCustomContent\Test\Scenario\CustomContentsScenario;
 use BcCustomContent\Test\Scenario\CustomEntriesScenario;
+use BcCustomContent\Test\Scenario\CustomTablesScenario;
 use CakephpFixtureFactories\Scenario\ScenarioAwareTrait;
 
 /**
@@ -52,6 +54,16 @@ public function setUp(): void
     {
         parent::setUp();
         $this->CustomContentFrontService = $this->getService(CustomContentFrontServiceInterface::class);
+        PluginFactory::make(  [
+            'name' => 'BcCustomContent',
+            'title' => 'カスタムコンテンツ',
+            'version' => '1.0.0',
+            'status' => '1',
+            'db_init' => '1',
+            'priority' => '1',
+            'created' => '2021-05-03 10:57:07',
+            'modified' => '2021-05-03 10:57:07'
+        ]);
     }
 
     /**
@@ -93,6 +105,7 @@ public function test_getCustomContent()
         ]);
 
         //フィクチャーからデーターを生成
+        $this->loadFixtureScenario(CustomTablesScenario::class);
         $this->loadFixtureScenario(CustomContentsScenario::class);
 
         //対象メソッドをコール
@@ -126,6 +139,7 @@ public function test_getCustomEntries()
         ]);
 
         //フィクチャーからデーターを生成
+        $this->loadFixtureScenario(CustomTablesScenario::class);
         $this->loadFixtureScenario(CustomContentsScenario::class);
         $this->loadFixtureScenario(CustomEntriesScenario::class);
 
@@ -162,6 +176,7 @@ public function test_getViewVarsForIndex()
 
         //フィクチャーからデーターを生成
         $this->loadFixtureScenario(InitAppScenario::class);
+        $this->loadFixtureScenario(CustomTablesScenario::class);
         $this->loadFixtureScenario(CustomContentsScenario::class);
         $this->loadFixtureScenario(CustomEntriesScenario::class);
         $this->loginAdmin($this->getRequest('/baser/admin/'));
@@ -203,6 +218,7 @@ public function test_getViewVarsForView()
 
         //フィクチャーからデーターを生成
         $this->loadFixtureScenario(InitAppScenario::class);
+        $this->loadFixtureScenario(CustomTablesScenario::class);
         $this->loadFixtureScenario(CustomContentsScenario::class);
         $this->loadFixtureScenario(CustomEntriesScenario::class);
         $this->loginAdmin($this->getRequest('/baser/admin/'));
@@ -241,6 +257,7 @@ public function test_getIndexTemplate()
         ]);
 
         //フィクチャーからデーターを生成
+        $this->loadFixtureScenario(CustomTablesScenario::class);
         $this->loadFixtureScenario(CustomContentsScenario::class);
         //対象メソッドをコール
         $rs = $this->CustomContentFrontService->getIndexTemplate($customContent->get(1));
@@ -274,6 +291,7 @@ public function test_getViewTemplate()
         ]);
 
         //フィクチャーからデーターを生成
+        $this->loadFixtureScenario(CustomTablesScenario::class);
         $this->loadFixtureScenario(CustomContentsScenario::class);
         //対象メソッドをコール
         $rs = $this->CustomContentFrontService->getViewTemplate($customContent->get(1));
@@ -306,6 +324,7 @@ public function test_setupPreviewForView()
         ]);
 
         //フィクチャーからデーターを生成
+        $this->loadFixtureScenario(CustomTablesScenario::class);
         $this->loadFixtureScenario(CustomContentsScenario::class);
         $this->loadFixtureScenario(CustomEntriesScenario::class);
 
@@ -346,7 +365,8 @@ public function test_setupPreviewForIndex()
         ]);
 
         //フィクチャーからデーターを生成
-        $this->loadFixtureScenario(CustomContentsScenario::class);
+        $this->loadFixtureScenario(CustomTablesScenario::class);
+        $this->loadFixtureScenario(CustomEntriesScenario::class);
         $this->loadFixtureScenario(CustomEntriesScenario::class);
 
         //対象メソッドをコール