Merge remote-tracking branch 'upstream/master' into independent-of-cli

nanasess · May 12, 2022 · dc6af9b · dc6af9b
2 parents 96b18ef + 0d606f8
commit dc6af9b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 142 deletions.
diff --git a/composer.json b/composer.json
@@ -33,8 +33,7 @@
         "ext-gd": "*",
         "ext-mbstring": "*",
         "mobiledetect/mobiledetectlib": "^2.8",
-        "nanasess/mdb2_driver_mysqli": "^1.5",
-        "nanasess/mdb2_driver_pgsql": "^1.5",
+        "nanasess/mdb2": "^2.5",
         "nanasess/php8-compat": "^1.0",
         "pear/archive_tar": "^1.4.3",
         "pear/mail": "*",
@@ -44,7 +43,6 @@
         "pear/xml_util": "*",
         "setasign/fpdf": "^1.8",
         "setasign/fpdi": "^1.6",
-        "silverorange/mdb2": "2.5.2-b.5",
         "smarty/smarty": "*"
     },
     "autoload": {

diff --git a/composer.lock b/composer.lock
diff --git a/e2e-tests/test/admin/total/total.test.ts b/e2e-tests/test/admin/total/total.test.ts
@@ -122,7 +122,6 @@ test.describe.serial('売上集計画面を確認をします', () => {
     });
 
     test('月度集計の確認をします', async () => {
-      await page.pause();
       await page.goto(url);
       await page.goto(`${url}?page=${method}`);
       await page.click('text=月度で集計する');
@@ -183,7 +182,6 @@ test.describe.serial('売上集計画面を確認をします', () => {
     });
 
     test('月度集計の確認をします', async () => {
-      await page.pause();
       await page.goto(url);
       await page.goto(`${url}?page=${method}`);
       await page.click('text=月度で集計する');
@@ -244,7 +242,6 @@ test.describe.serial('売上集計画面を確認をします', () => {
     });
 
     test('月度集計の確認をします', async () => {
-      await page.pause();
       await page.goto(url);
       await page.goto(`${url}?page=${method}`);
       await page.click('text=月度で集計する');
@@ -289,7 +286,6 @@ test.describe.serial('売上集計画面を確認をします', () => {
     });
 
     test('月度集計の確認をします', async () => {
-      await page.pause();
       await page.goto(url);
       await page.goto(`${url}?page=${method}`);
       await page.click('text=月度で集計する');

diff --git a/e2e-tests/test/front_guest/shopping.test.ts b/e2e-tests/test/front_guest/shopping.test.ts
@@ -103,7 +103,6 @@ test.describe.serial('購入フロー(ゲスト)のテストをします', () =>
   });
 
   test('お支払い方法・お届け時間の指定をします', async () => {
-    await page.pause();
     await page.click('text=代金引換');
     await page.selectOption('select[name=deliv_date1]', { index: 2 });
     await page.selectOption('select[name=deliv_time_id1]', { label: '午後' });

diff --git a/e2e-tests/test/front_login/contact.test.ts b/e2e-tests/test/front_login/contact.test.ts
@@ -142,7 +142,6 @@ test.describe.serial('お問い合わせページのテストをします', () =
     await page.goto(PlaywrightConfig.use.baseURL);       // ログアウトしてしまう場合があるので一旦トップへ遷移する
     await page.goto(url);
     await page.click('input[name=confirm]');
-    await page.pause();
     await expect(page.locator('span.attention >> nth=13')).toContainText('※ お問い合わせ内容が入力されていません。');
     await expect(page.locator('textarea[name=contents]')).toHaveAttribute('style', 'background-color:#ffe8e8; ime-mode: active;');
   });

diff --git a/e2e-tests/test/front_login/shopping/shopping_deliv.test.ts b/e2e-tests/test/front_login/shopping/shopping_deliv.test.ts
@@ -1,5 +1,5 @@
 import PlaywrightConfig from '../../../../playwright.config';
-import { ZapClient, ContextType, Risk, HttpMessage } from '../../../utils/ZapClient';
+import { ZapClient, ContextType, Risk } from '../../../utils/ZapClient';
 import { intervalRepeater } from '../../../utils/Progress';
 const zapClient = new ZapClient();