From 50b108bd797cfbefb842bf0d83cb4ad31c82c72a Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Sat, 26 Mar 2022 10:51:39 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E3=81=8A=E5=95=8F=E3=81=84=E5=90=88?=
 =?UTF-8?q?=E3=82=8F=E3=81=9B=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0=E3=81=AE?=
 =?UTF-8?q?=E5=85=A5=E5=8A=9B=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=81=A7?=
 =?UTF-8?q?=E3=82=B7=E3=82=B9=E3=83=86=E3=83=A0=E3=82=A8=E3=83=A9=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

お問い合わせフォームのお問い合わせ覧を空欄で確認画面へ進むとシステムエラーになるのを修正
---
 data/Smarty/templates/default/contact/index.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/Smarty/templates/default/contact/index.tpl b/data/Smarty/templates/default/contact/index.tpl
index 3bf3ff4d16..7c712a13ab 100644
--- a/data/Smarty/templates/default/contact/index.tpl
+++ b/data/Smarty/templates/default/contact/index.tpl
@@ -114,7 +114,7 @@
                     <span class="mini">（全角<!--{$smarty.const.MLTEXT_LEN}-->字以下）</span></th>
                     <td>
                         <span class="attention"><!--{$arrErr.contents}--></span>
-                        <textarea name="contents" class="box380" cols="60" rows="20" style="<!--{$arrErr.contents.value|h|sfGetErrorColor}-->; ime-mode: active;"><!--{"\n"}--><!--{$arrForm.contents.value|h}--></textarea>
+                        <textarea name="contents" class="box380" cols="60" rows="20" style="<!--{$arrErr.contents|sfGetErrorColor}-->; ime-mode: active;"><!--{"\n"}--><!--{$arrForm.contents.value|h}--></textarea>
                         <p class="mini attention">※ご注文に関するお問い合わせには、必ず「ご注文番号」をご記入くださいますようお願いいたします。</p>
                     </td>
                 </tr>

From 3ff4360b1719f62c0f4a1d366f77eb556f6be8ed Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Tue, 29 Mar 2022 16:28:33 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=83=8F?=
 =?UTF-8?q?=E3=83=B3=E3=83=89=E3=83=AA=E3=83=B3=E3=82=B0=E3=81=AEE2E?=
 =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

see https://github.com/EC-CUBE/ec-cube2/pull/536
---
 e2e-tests/test/front_login/contact.test.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/e2e-tests/test/front_login/contact.test.ts b/e2e-tests/test/front_login/contact.test.ts
index 4649273734..3ca949b9db 100644
--- a/e2e-tests/test/front_login/contact.test.ts
+++ b/e2e-tests/test/front_login/contact.test.ts
@@ -134,4 +134,16 @@ test.describe.serial('お問い合わせページのテストをします', () =
         .then(alerts => expect(alerts).toEqual([]));
     });
   });
+
+  /**
+   * https://github.com/EC-CUBE/ec-cube2/pull/536 のE2Eテスト
+   */
+  test('ラーメッセージの表示を確認します', async () => {
+    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;');
+  });
 });