test(stability): add waitForReload after submit in SiteManage; guard FAQ general category click and wait for form

Author: gakigaki

tests/Browser/Manage/SiteManageTest.php

@@ -113,6 +113,7 @@ private function update()
     {
         $this->browse(function (Browser $browser) {
             $browser->press('更新')
+                    ->waitForReload()
                     ->assertTitleContains('Connect-CMS')
                     ->screenshot('manage/site/update/images/update');
         });
@@ -160,6 +161,7 @@ private function saveMeta()
     {
         $this->browse(function (Browser $browser) {
             $browser->press('更新')
+                    ->waitForReload()
                     ->assertTitleContains('Connect-CMS')
                     ->assertSee('メタ情報を更新しました。')
                     ->screenshot('manage/site/meta/images/saveMeta');
@@ -205,6 +207,7 @@ private function saveLayout()
     {
         $this->browse(function (Browser $browser) {
             $browser->press('変更')
+                    ->waitForReload()
                     ->assertTitleContains('Connect-CMS')
                     ->screenshot('manage/site/layout/images/saveLayout');
         });
@@ -242,6 +245,7 @@ private function saveCategories()
     {
         $this->browse(function (Browser $browser) {
             $browser->press('変更')
+                    ->waitForReload()
                     ->assertTitleContains('Connect-CMS')
                     ->screenshot('manage/site/categories/images/saveCategories');
         });
@@ -277,6 +281,7 @@ private function saveLanguages()
     {
         $this->browse(function (Browser $browser) {
             $browser->press('変更')
+                    ->waitForReload()
                     ->assertTitleContains('Connect-CMS')
                     ->screenshot('manage/site/languages/images/saveLanguages');
         });
@@ -311,6 +316,7 @@ private function savePageError()
     {
         $this->browse(function (Browser $browser) {
             $browser->press('更新')
+                    ->waitForReload()
                     ->assertTitleContains('Connect-CMS')
                     ->screenshot('manage/site/pageError/images/savePageError');
         });
@@ -344,7 +350,7 @@ private function saveAnalytics()
     {
         $this->browse(function (Browser $browser) {
             $browser->press('更新')
-                    ->pause(500)
+                    ->waitForReload()
                     ->assertTitleContains('Connect-CMS')
                     ->screenshot('manage/site/analytics/images/saveAnalytics');
         });

tests/Browser/User/FaqsPluginTest.php

@@ -182,10 +182,16 @@ private function listCategories()
             $browser->pause(500);
 
             $browser->visit('/plugin/faqs/listCategories/' . $this->test_frame->page_id . '/' . $this->test_frame->id . '#frame-' . $this->test_frame->id)
-                    ->pause(500)
                     ->assertPathBeginsWith('/')
-                    ->click('#div_general_view_flag_1')  // カスタムチェックボックスのインプットとラベルをくくるdivは自動テスト時、ラベルが空の場合にクリックできないための対応
-                    ->press('変更')
+                    ->waitFor('input[name="add_category"]');
+
+            // 共通カテゴリ行が存在する場合のみクリック（SiteManageTestの結果に依存しないように）
+            $exists = $browser->script("return document.querySelector('#div_general_view_flag_1') !== null;")[0];
+            if ($exists) {
+                $browser->click('#div_general_view_flag_1');
+            }
+
+            $browser->press('変更')
                     ->screenshot('user/faqs/listCategories/images/listCategories');
         });