EC-CUBE · chihiro-adachi · Jun 27, 2022 · Jun 10, 2022 · Jun 10, 2022 · Jun 10, 2022
diff --git a/codeception/_support/AcceptanceTester.php b/codeception/_support/AcceptanceTester.php
@@ -70,7 +70,7 @@ public function logoutAsAdmin()
             $I->click('body div.popover .popover-body a:last-child');
             $config = Fixtures::get('config');
             $I->amOnPage('/'.$config['eccube_admin_route'].'/logout');
-            $I->see('ログイン', '#form1 > button');
+            $I->see('ログイン', '#form1 > div > button');
         }
     }
 

diff --git a/codeception/_support/Page/Admin/BlockManagePage.php b/codeception/_support/Page/Admin/BlockManagePage.php
@@ -38,13 +38,13 @@ public function 新規入力()
     public function 編集($rowNum)
     {
         $rowNum++;
-        $this->tester->click(".c-contentsArea .list-group > li:nth-child(${rowNum}) a[data-original-title=編集]");
+        $this->tester->click(".c-contentsArea .list-group > li:nth-child(${rowNum}) a[data-bs-original-title=編集]");
     }
 
     public function 削除($rowNum)
     {
         $rowNum++;
-        $this->tester->click(".c-contentsArea .list-group > li:nth-child(${rowNum}) [data-original-title=削除] a");
+        $this->tester->click(".c-contentsArea .list-group > li:nth-child(${rowNum}) [data-bs-original-title=削除] a");
         return $this;
     }
 

diff --git a/codeception/_support/Page/Admin/CategoryManagePage.php b/codeception/_support/Page/Admin/CategoryManagePage.php
@@ -108,15 +108,15 @@ public function CSV出力項目設定()
 
     public function 一覧_上に($rowNum)
     {
-        $this->tester->dragAndDropBy("body > div > div.c-contentsArea > div.c-contentsArea__cols > div.c-contentsArea__primaryCol > div > div > div > div > ul > li:nth-child($rowNum)", 0, -75);
+        $this->tester->dragAndDropBy("body > div > div.c-contentsArea > div.c-contentsArea__cols > div.c-contentsArea__primaryCol > div > div > div > div > ul > li:nth-child($rowNum)", 0, -60);
         $this->tester->wait(1);
 
         return $this;
     }
 
     public function 一覧_下に($rowNum)
     {
-        $this->tester->dragAndDropBy("body > div > div.c-contentsArea > div.c-contentsArea__cols > div.c-contentsArea__primaryCol > div > div > div > div > ul > li:nth-child($rowNum)", 0, 75);
+        $this->tester->dragAndDropBy("body > div > div.c-contentsArea > div.c-contentsArea__cols > div.c-contentsArea__primaryCol > div > div > div > div > ul > li:nth-child($rowNum)", 0, 60);
         $this->tester->wait(1);
 
         return $this;

diff --git a/codeception/_support/Page/Admin/OrderManagePage.php b/codeception/_support/Page/Admin/OrderManagePage.php
@@ -46,6 +46,8 @@ public static function at(\AcceptanceTester $I)
     public function 検索($value = '')
     {
         $this->tester->fillField(['id' => 'admin_search_order_multi'], $value);
+        $this->tester->scrollTo('#search_submit', 0, -100);
+        $this->tester->wait(1);
         $this->tester->click('#search_form #search_submit');
 
         return $this;
@@ -249,10 +251,13 @@ public function 受注ステータス変更($option = [])
 
     public function 出荷済にする($rowNum)
     {
+        $this->tester->scrollTo('#search_result');
+        $this->tester->wait(1);
         $this->tester->click("#search_result > tbody > tr:nth-child($rowNum) a[data-type='status']");
         $this->tester->waitForElementVisible(['id' => 'sentUpdateModal']);
         $this->tester->click(['id' => 'notificationMail']);
         $this->tester->scrollTo(['id' => 'bulkChange']);
+        $this->tester->wait(1);
         $this->tester->click(['id' => 'bulkChange']);
         $this->tester->waitForElementVisible(['id' => 'bulkChangeComplete']);
 

diff --git a/codeception/_support/Page/Admin/PluginManagePage.php b/codeception/_support/Page/Admin/PluginManagePage.php
@@ -92,7 +92,7 @@ public function ストアプラグイン_アップデート($pluginCode)
 
     private function ストアプラグイン_ボタンクリック($pluginCode, $label)
     {
-        $xpath = ['xpath' => $this->ストアプラグイン_セレクタ($pluginCode).'/../../td[6]//i[@data-original-title="'.$label.'"]/parent::node()'];
+        $xpath = ['xpath' => $this->ストアプラグイン_セレクタ($pluginCode).'/../../td[6]//i[@data-bs-original-title="'.$label.'"]/parent::node()'];
         $this->tester->click($xpath);
 
         return $this;
@@ -139,7 +139,7 @@ public function 独自プラグイン_アップデート($pluginCode, $fileName)
 
     private function 独自プラグイン_ボタンクリック($pluginCode, $label)
     {
-        $xpath = ['xpath' => $this->独自プラグイン_セレクタ($pluginCode).'/../td[6]//i[@data-original-title="'.$label.'"]/parent::node()'];
+        $xpath = ['xpath' => $this->独自プラグイン_セレクタ($pluginCode).'/../td[6]//i[@data-bs-original-title="'.$label.'"]/parent::node()'];
         $this->tester->click($xpath);
 
         return $this;

diff --git a/codeception/_support/Page/Admin/ProductManagePage.php b/codeception/_support/Page/Admin/ProductManagePage.php
@@ -225,7 +225,7 @@ public function 検索結果_チェックボックスON($rowNum)
 
     public function 検索結果_削除()
     {
-        $this->tester->click(['css' => '#btn_bulk button[data-target="#bulkDeleteModal"]']);
+        $this->tester->click(['css' => '#btn_bulk button[data-bs-target="#bulkDeleteModal"]']);
         $this->tester->wait(1);
 
         return $this;

diff --git a/codeception/_support/Page/Admin/ProductTagPage.php b/codeception/_support/Page/Admin/ProductTagPage.php
@@ -55,7 +55,7 @@ public function 新規作成()
     public function タグ編集_開始($row)
     {
         $row = $row + 2;
-        $this->tester->click(['css' => ".c-primaryCol .list-group > li:nth-child({$row}) a[data-original-title=編集]"]);
+        $this->tester->click(['css' => ".c-primaryCol .list-group > li:nth-child({$row}) a[data-bs-original-title=編集]"]);
         $this->tester->waitForElementVisible(['css' => ".c-primaryCol .list-group > li:nth-child({$row}) form"]);
         return $this;
     }
@@ -78,7 +78,7 @@ public function タグ編集_決定($row)
     public function タグ削除($row)
     {
         $row = $row + 2;
-        $this->tester->click(['css' => ".c-primaryCol .list-group > li:nth-child({$row}) a[data-target='#DeleteModal']"]);
+        $this->tester->click(['css' => ".c-primaryCol .list-group > li:nth-child({$row}) a[data-bs-target='#DeleteModal']"]);
         $this->tester->waitForElementVisible(['id' => 'DeleteModal']);
         $this->tester->wait(1);
         return $this;

diff --git a/codeception/acceptance/EA04OrderCest.php b/codeception/acceptance/EA04OrderCest.php
@@ -399,6 +399,9 @@ public function order_納品書の一括出力(AcceptanceTester $I)
         $I->see('検索結果：'.count($TargetOrders).'件が該当しました', OrderManagePage::$検索結果_メッセージ);
 
         $OrderListPage->すべてチェック();
+        $I->scrollTo('#page_admin_order', 0, 0);
+        $I->wait(1);
+
         $OrderListPage->要素をクリック('#form_bulk #bulkExportPdf');
 
         // 別ウィンドウ
@@ -409,6 +412,8 @@ public function order_納品書の一括出力(AcceptanceTester $I)
         $OrderListPage->PDFフォームを入力(['id' => 'order_pdf_note1'], 'Test note first');
         $OrderListPage->PDFフォームを入力(['id' => 'order_pdf_note2'], 'Test note second');
         $OrderListPage->PDFフォームを入力(['id' => 'order_pdf_note3'], 'Test note third');
+        $I->scrollTo('#order_pdf_default', 0, 200);
+        $I->wait(1);
         $OrderListPage->要素をクリック('#order_pdf_default');
         $OrderListPage->要素をクリック('#order_pdf_form .c-conversionArea .justify-content-end button.btn-ec-conversion');
         // make sure wait to download file completely

diff --git a/codeception/acceptance/EF02ProductCest.php b/codeception/acceptance/EF02ProductCest.php
@@ -115,6 +115,8 @@ public function product_商品一覧ページング(AcceptanceTester $I)
         $topPage->カテゴリ選択(['新入荷']);
 
         // 絞込検索条件では、検索数が多い場合、「次へ」「前へ」「ページ番号」が表示される
+        $I->scrollTo(['css' => 'li.ec-pager__item--active']);
+        $I->wait(1);
         $I->see('1', ['css' => 'li.ec-pager__item--active']);
         $I->see('2', ['xpath' => "//li[@class='ec-pager__item'][position()=1]"]);
         $I->see('次へ', ['xpath' => "//li[@class='ec-pager__item'][position()=2]"]);
@@ -123,14 +125,20 @@ public function product_商品一覧ページング(AcceptanceTester $I)
 
         // '2'をクリック
         $I->click(['xpath' => "//li[@class='ec-pager__item'][position()=1]/a"]);
+        $I->scrollTo(['css' => 'li.ec-pager__item--active']);
+        $I->wait(1);
         $I->see('2', ['css' => 'li.ec-pager__item--active']);
 
         // '前へ'をクリック
         $I->click(['xpath' => "//li[@class='ec-pager__item'][position()=1]/a"]);
+        $I->scrollTo(['css' => 'li.ec-pager__item--active']);
+        $I->wait(1);
         $I->see('1', ['css' => 'li.ec-pager__item--active']);
 
         // '次へ'をクリック
         $I->click(['xpath' => "//li[@class='ec-pager__item'][position()=2]/a"]);
+        $I->scrollTo(['css' => 'li.ec-pager__item--active']);
+        $I->wait(1);
         $I->see('2', ['css' => 'li.ec-pager__item--active']);
     }
 

diff --git a/codeception/acceptance/EF06OtherCest.php b/codeception/acceptance/EF06OtherCest.php
@@ -139,10 +139,8 @@ public function other_ログアウト(AcceptanceTester $I)
     public function other_当サイトについて(AcceptanceTester $I)
     {
         $I->wantTo('EF0604-UC01-T01 当サイトについて');
-        $I->amOnPage('/');
+        $I->amOnPage('/help/about');
 
-        $I->scrollTo('.ec-footerNavi .ec-footerNavi__link:nth-child(1) a', 0, 200);
-        $I->click('.ec-footerNavi .ec-footerNavi__link:nth-child(1) a');
         $I->see('当サイトについて', 'div.ec-pageHeader h1');
         $baseinfo = Fixtures::get('baseinfo');
         $I->see($baseinfo->getShopName(), '#help_about_box__shop_name');
@@ -154,10 +152,8 @@ public function other_当サイトについて(AcceptanceTester $I)
     public function other_プライバシーポリシー(AcceptanceTester $I)
     {
         $I->wantTo('EF0605-UC01-T01 プライバシーポリシー');
-        $I->amOnPage('/');
+        $I->amOnPage('/help/privacy');
 
-        $I->scrollTo('.ec-footerNavi .ec-footerNavi__link:nth-child(2) a', 0, 200);
-        $I->click('.ec-footerNavi .ec-footerNavi__link:nth-child(2) a');
         $I->see('プライバシーポリシー', 'div.ec-pageHeader h1');
         $I->see('個人情報保護の重要性に鑑み、「個人情報の保護に関する法律」及び本プライバシーポリシーを遵守し、お客さまのプライバシー保護に努めます。', 'div.ec-layoutRole__main p:nth-child(1)');
     }
@@ -168,10 +164,8 @@ public function other_プライバシーポリシー(AcceptanceTester $I)
     public function other_特定商取引法に基づく表記(AcceptanceTester $I)
     {
         $I->wantTo('EF0606-UC01-T01 特定商取引法に基づく表記');
-        $I->amOnPage('/');
+        $I->amOnPage('/help/tradelaw');
 
-        $I->scrollTo('.ec-footerNavi .ec-footerNavi__link:nth-child(3) a', 0, 200);
-        $I->click('.ec-footerNavi .ec-footerNavi__link:nth-child(3) a');
         $I->see('特定商取引法に基づく表記', 'div.ec-pageHeader h1');
     }
 
@@ -181,14 +175,12 @@ public function other_特定商取引法に基づく表記(AcceptanceTester $I)
     public function other_お問い合わせ1(AcceptanceTester $I)
     {
         $I->wantTo('EF0607-UC01-T01 お問い合わせ');
-        $I->amOnPage('/');
+        $I->amOnPage('/contact');
         $I->resetEmails();
         $faker = Fixtures::get('faker');
         $new_email = microtime(true).'.'.$faker->safeEmail;
         $BaseInfo = Fixtures::get('baseinfo');
 
-        $I->scrollTo('.ec-footerNavi .ec-footerNavi__link:nth-child(4) a', 0, 200);
-        $I->click('.ec-footerNavi .ec-footerNavi__link:nth-child(4) a');
         $I->see('お問い合わせ', 'div.ec-pageHeader h1');
 
         $I->fillField(['id' => 'contact_name_name01'], '姓');
@@ -224,14 +216,12 @@ public function other_お問い合わせ1(AcceptanceTester $I)
     public function other_お問い合わせ2(AcceptanceTester $I)
     {
         $I->wantTo('EF0607-UC01-T02 お問い合わせ 戻るボタン');
-        $I->amOnPage('/');
+        $I->amOnPage('/contact');
         $I->resetEmails();
         $faker = Fixtures::get('faker');
         $new_email = microtime(true).'.'.$faker->safeEmail;
         $BaseInfo = Fixtures::get('baseinfo');
 
-        $I->scrollTo('.ec-footerNavi .ec-footerNavi__link:nth-child(4) a', 0, 200);
-        $I->click('.ec-footerNavi .ec-footerNavi__link:nth-child(4) a');
         $I->see('お問い合わせ', 'div.ec-pageHeader h1');
 
         $I->fillField(['id' => 'contact_name_name01'], '姓');
@@ -285,10 +275,8 @@ public function other_お問い合わせ2(AcceptanceTester $I)
     public function other_お問い合わせ_異常(AcceptanceTester $I)
     {
         $I->wantTo('EF0607-UC01-T03 お問い合わせ 異常');
-        $I->amOnPage('/');
+        $I->amOnPage('/contact');
 
-        $I->scrollTo('.ec-footerNavi .ec-footerNavi__link:nth-child(4) a', 0, 200);
-        $I->click('.ec-footerNavi .ec-footerNavi__link:nth-child(4) a');
         $I->see('お問い合わせ', 'div.ec-pageHeader h1');
 
         $I->click('div.ec-RegisterRole__actions button.ec-blockBtn--action');

diff --git a/html/bundle/admin.bundle.js b/html/bundle/admin.bundle.js
diff --git a/html/bundle/admin.bundle.js.LICENSE.txt b/html/bundle/admin.bundle.js.LICENSE.txt
@@ -1,3 +1,9 @@
+/*!
+  * Bootstrap v5.1.3 (https://getbootstrap.com/)
+  * Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+  */
+
 /*!
  * @kurkle/color v0.2.1
  * https://github.com/kurkle/color#readme

diff --git a/html/bundle/admin.bundle.js.map b/html/bundle/admin.bundle.js.map
diff --git a/html/bundle/front.bundle.js b/html/bundle/front.bundle.js
diff --git a/html/bundle/front.bundle.js.LICENSE.txt b/html/bundle/front.bundle.js.LICENSE.txt
@@ -1,3 +1,9 @@
+/*!
+  * Bootstrap v5.1.3 (https://getbootstrap.com/)
+  * Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+  */
+
 /*!
  * Sizzle CSS Selector Engine v2.3.6
  * https://sizzlejs.com/

diff --git a/html/bundle/front.bundle.js.map b/html/bundle/front.bundle.js.map
diff --git a/html/bundle/install.bundle.js b/html/bundle/install.bundle.js
diff --git a/html/bundle/install.bundle.js.LICENSE.txt b/html/bundle/install.bundle.js.LICENSE.txt
@@ -1,3 +1,9 @@
+/*!
+  * Bootstrap v5.1.3 (https://getbootstrap.com/)
+  * Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+  */
+
 /*!
  * Sizzle CSS Selector Engine v2.3.6
  * https://sizzlejs.com/

diff --git a/html/bundle/install.bundle.js.map b/html/bundle/install.bundle.js.map