Merge branch '5.1.x' into unittest_MailController_index

baserproject · Nov 6, 2024 · 43544b4 · 43544b4
2 parents a7a46ff + bc3b7b7
commit 43544b4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/plugins/baser-core/tests/TestCase/Service/ContentsServiceTest.php b/plugins/baser-core/tests/TestCase/Service/ContentsServiceTest.php
@@ -453,6 +453,7 @@ public function testGetParentLayoutTemplate()
      */
     public function testGetUrlById($id, $full, $expects)
     {
+        $this->loadFixtureScenario(SitesScenario::class);
         $this->loadFixtureScenario(ContentsScenario::class);
         $siteUrl = Configure::read('BcEnv.siteUrl');
         Configure::write('BcEnv.siteUrl', 'http://main.com');

diff --git a/plugins/baser-core/tests/TestCase/Utility/BcComposerTest.php b/plugins/baser-core/tests/TestCase/Utility/BcComposerTest.php
@@ -238,12 +238,19 @@ public function testInstall()
      */
     public function testSelfUpdate()
     {
+        /**
+         * 次のエラーが発生するため、テストをスキップ
+         * The repository at "/var/www/html" does not have the correct ownership and git refuses to use it:
+         * 次のコマンドを実行するように調整しても解決しなかった
+         * git config --global --add safe.directory /var/www/html/
+         */
+        $this->markTestIncomplete('このメソッドを利用すると全体のテストが失敗してしまうためスキップ。対応方法検討要');
         BcComposer::setup();
         $rs = BcComposer::selfUpdate();
 
         $this->assertEquals(0, $rs['code']);
         $this->assertEquals("A script named install would override a Composer command and has been skipped", $rs['out'][0]);
-        $this->assertStringContainsString("You are already using the latest available Composer version", $rs['out'][1]);
+        $this->assertMatchesRegularExpression("/(You are already using the latest available Composer version|Upgrading to version)/", $rs['out'][1]);
     }
 
     /**
@@ -337,6 +344,13 @@ public function testDeleteReplace()
      */
     public function testExecCommand()
     {
+        /**
+         * 次のエラーが発生するため、テストをスキップ
+         * The repository at "/var/www/html" does not have the correct ownership and git refuses to use it:
+         * 次のコマンドを実行するように調整しても解決しなかった
+         * git config --global --add safe.directory /var/www/html/
+         */
+        $this->markTestIncomplete('このメソッドを利用すると全体のテストが失敗してしまうためスキップ。対応方法検討要');
         BcComposer::setup();
         $rs = BcComposer::execCommand('update --with-all-dependencies --ignore-platform-req=ext-xdebug');