BcCore/Middleware FixtureManager を FixtureFactory に変更する baserproject#…

…2883
HungDV2022 · Dec 1, 2023 · c6c01de · c6c01de
1 parent 37dc945
commit c6c01de
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 20 deletions.
diff --git a/plugins/baser-core/tests/TestCase/Middleware/BcAdminMiddlewareTest.php b/plugins/baser-core/tests/TestCase/Middleware/BcAdminMiddlewareTest.php
@@ -12,23 +12,20 @@
 namespace BaserCore\Test\TestCase\Middleware;
 
 use BaserCore\Middleware\BcAdminMiddleware;
+use BaserCore\Test\Scenario\InitAppScenario;
 use BaserCore\TestSuite\BcTestCase;
+use CakephpFixtureFactories\Scenario\ScenarioAwareTrait;
 
 /**
  * Class BcAdminMiddlewareTest
  * @property BcAdminMiddleware $BcAdminMiddleware
  */
 class BcAdminMiddlewareTest extends BcTestCase
 {
-
     /**
-     * Fixtures
-     *
-     * @var array
+     * ScenarioAwareTrait
      */
-    protected $fixtures = [
-        'plugin.BaserCore.Sites',
-    ];
+    use ScenarioAwareTrait;
 
     /**
      * Set Up
@@ -38,6 +35,7 @@ class BcAdminMiddlewareTest extends BcTestCase
     public function setUp(): void
     {
         parent::setUp();
+        $this->loadFixtureScenario(InitAppScenario::class);
         $this->BcAdminMiddleware = new BcAdminMiddleware();
     }
 
@@ -57,9 +55,9 @@ public function tearDown(): void
      */
     public function testProcess(): void
     {
-        $request = $this->getRequest('/baser/admin/?site_id=3');
+        $request = $this->getRequest('/baser/admin/?site_id=1');
         $request = $this->execPrivateMethod($this->BcAdminMiddleware, 'setCurrentSite', [$request]);
-        $this->assertEquals(3, $request->getAttribute('currentSite')->id);
+        $this->assertEquals(1, $request->getAttribute('currentSite')->id);
     }
 
 }
diff --git a/plugins/baser-core/tests/TestCase/Middleware/BcRequestFilterMiddlewareTest.php b/plugins/baser-core/tests/TestCase/Middleware/BcRequestFilterMiddlewareTest.php
@@ -12,9 +12,11 @@
 namespace BaserCore\Test\TestCase\Middleware;
 
 use BaserCore\Middleware\BcRequestFilterMiddleware;
+use BaserCore\Test\Scenario\MultiSiteScenario;
 use BaserCore\TestSuite\BcTestCase;
 use BaserCore\Utility\BcUtil;
 use Cake\Core\Configure;
+use CakephpFixtureFactories\Scenario\ScenarioAwareTrait;
 use ReflectionClass;
 
 /**
@@ -23,19 +25,10 @@
  */
 class BcRequestFilterMiddlewareTest extends BcTestCase
 {
-
     /**
-     * Fixtures
-     *
-     * @var array
+     * ScenarioAwareTrait
      */
-    protected $fixtures = [
-        'plugin.BaserCore.Sites',
-        'plugin.BaserCore.Contents',
-        'plugin.BaserCore.ContentFolders',
-        'plugin.BaserCore.Pages',
-        'plugin.BaserCore.SiteConfigs',
-    ];
+    use ScenarioAwareTrait;
 
     /**
      * Set Up
@@ -50,6 +43,7 @@ public function setUp(): void
             Configure::write('BcRequest.isInstalled', true);
         }
         parent::setUp();
+        $this->loadFixtureScenario(MultiSiteScenario::class);
         $this->BcRequestFilterMiddleware = new BcRequestFilterMiddleware();
     }