From c6b18f681526c9b400e4c94d02d783c8d3eeca99 Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Tue, 14 May 2019 10:31:13 +0900
Subject: [PATCH 01/22] =?UTF-8?q?.env=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env b/.env
index 124f289..d5beba4 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-ECCUBE_BRANCH=master
-ECCUBE_REPOS=https://github.com/EC-CUBE/ec-cube.git
+ECCUBE_BRANCH=3.0.18_version
+ECCUBE_REPOS=https://github.com/kazumiiiiiiiiiii/ec-cube.git
 ECCUBE_BASE_URL=http://eccube3/
 

From b603d622fe01755de183c42de8b78b4ca8d5c3a4 Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Tue, 14 May 2019 12:59:53 +0900
Subject: [PATCH 02/22] =?UTF-8?q?selector=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/acceptance/EF03OrderMultiShippingCest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/acceptance/EF03OrderMultiShippingCest.php b/tests/acceptance/EF03OrderMultiShippingCest.php
index c66a0a7..9e8dfa8 100644
--- a/tests/acceptance/EF03OrderMultiShippingCest.php
+++ b/tests/acceptance/EF03OrderMultiShippingCest.php
@@ -69,7 +69,7 @@ public function order_MultiShipping_TwoType_OneAddress(\AcceptanceTester $i)
         $i->click('#main_middle .total_box .btn_group p a');
 
         // 確認
-        $i->see('配送方法が異なる商品が含まれているため、お届け先は複数となります', '#main_middle #confirm_flow_box #confirm_flow_box__message--1 p');
+        $i->see('配送方法が異なる商品が含まれているため、お届け先は複数となります', '#main_middle #confirm_wrap #confirm_flow_box #confirm_flow_box__body #confirm_flow_box__message--1 p');
         $i->see('ご注文内容のご確認', '#main_middle .page-heading');
         $i->see('お客様情報', '#main_middle #shopping-form #confirm_main');
         $i->see('配送情報', '#main_middle #shopping-form #confirm_main');

From 6467c91acd80241f474c84d13aa0a635e09ec90b Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Tue, 14 May 2019 13:15:22 +0900
Subject: [PATCH 03/22] =?UTF-8?q?selector=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/acceptance/EF03OrderMultiShippingCest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/acceptance/EF03OrderMultiShippingCest.php b/tests/acceptance/EF03OrderMultiShippingCest.php
index 9e8dfa8..075f7d8 100644
--- a/tests/acceptance/EF03OrderMultiShippingCest.php
+++ b/tests/acceptance/EF03OrderMultiShippingCest.php
@@ -69,7 +69,7 @@ public function order_MultiShipping_TwoType_OneAddress(\AcceptanceTester $i)
         $i->click('#main_middle .total_box .btn_group p a');
 
         // 確認
-        $i->see('配送方法が異なる商品が含まれているため、お届け先は複数となります', '#main_middle #confirm_wrap #confirm_flow_box #confirm_flow_box__body #confirm_flow_box__message--1 p');
+        $i->see('配送方法が異なる商品が含まれているため、お届け先は複数となります', '#main_middle #confirm_wrap #confirm_flow_box #confirm_flow_box__body #confirm_flow_box__message p');
         $i->see('ご注文内容のご確認', '#main_middle .page-heading');
         $i->see('お客様情報', '#main_middle #shopping-form #confirm_main');
         $i->see('配送情報', '#main_middle #shopping-form #confirm_main');

From f8b1c1e18716b2ee57ca8d3d78e67a7eab3de9c0 Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Tue, 14 May 2019 14:02:40 +0900
Subject: [PATCH 04/22] =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E5=87=BA?=
 =?UTF-8?q?=E5=8A=9B=E3=81=AE=E7=A2=BA=E8=AA=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/acceptance/EF03OrderMultiShippingCest.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/acceptance/EF03OrderMultiShippingCest.php b/tests/acceptance/EF03OrderMultiShippingCest.php
index 075f7d8..ad6af34 100644
--- a/tests/acceptance/EF03OrderMultiShippingCest.php
+++ b/tests/acceptance/EF03OrderMultiShippingCest.php
@@ -68,8 +68,13 @@ public function order_MultiShipping_TwoType_OneAddress(\AcceptanceTester $i)
         // go to cart page
         $i->click('#main_middle .total_box .btn_group p a');
 
+
+        $test = $i->grabTextFrom('#main_middle #confirm_flow_box');
+
+        $i->assertEquals("配送方法が異なる商品が含まれているため、お届け先は複数となります。", $test);
+
         // 確認
-        $i->see('配送方法が異なる商品が含まれているため、お届け先は複数となります', '#main_middle #confirm_wrap #confirm_flow_box #confirm_flow_box__body #confirm_flow_box__message p');
+        $i->see('配送方法が異なる商品が含まれているため、お届け先は複数となります。', '#main_middle #confirm_flow_box #confirm_flow_box__message--1 p');
         $i->see('ご注文内容のご確認', '#main_middle .page-heading');
         $i->see('お客様情報', '#main_middle #shopping-form #confirm_main');
         $i->see('配送情報', '#main_middle #shopping-form #confirm_main');

From b3f5a40acc182486cc68283f66945efe5dab0caa Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Tue, 14 May 2019 14:21:58 +0900
Subject: [PATCH 05/22] debug

---
 tests/acceptance/EF03OrderMultiShippingCest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/acceptance/EF03OrderMultiShippingCest.php b/tests/acceptance/EF03OrderMultiShippingCest.php
index ad6af34..3703a4e 100644
--- a/tests/acceptance/EF03OrderMultiShippingCest.php
+++ b/tests/acceptance/EF03OrderMultiShippingCest.php
@@ -68,9 +68,10 @@ public function order_MultiShipping_TwoType_OneAddress(\AcceptanceTester $i)
         // go to cart page
         $i->click('#main_middle .total_box .btn_group p a');
 
-
         $test = $i->grabTextFrom('#main_middle #confirm_flow_box');
 
+        codecept_debug($test);
+
         $i->assertEquals("配送方法が異なる商品が含まれているため、お届け先は複数となります。", $test);
 
         // 確認

From 361c233d14257b3e55d37adb96fde52f9f4a0cb9 Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Tue, 14 May 2019 14:37:38 +0900
Subject: [PATCH 06/22] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml                                   | 37 +------------------
 .../acceptance/EF03OrderMultiShippingCest.php | 10 +----
 2 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0191977..729ea09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,42 +7,7 @@ services:
   - docker
 
 env:
-  ## Firefox, PostgreSQL
-  - BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=firefox,pgsql
-  - BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
-  - BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
-  - BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
-  - BROWSER=firefox DB=pgsql84 TARGET_GROUP=front TARGET_ENV=firefox,pgsql
-  - BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
-  - BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
-  - BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
-  ## Firefox, MySQL
-  - BROWSER=firefox DB=mysql TARGET_GROUP=front TARGET_ENV=firefox,mysql
-  - BROWSER=firefox DB=mysql TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
-  - BROWSER=firefox DB=mysql TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
-  - BROWSER=firefox DB=mysql TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
-  - BROWSER=firefox DB=mysql51 TARGET_GROUP=front TARGET_ENV=firefox,mysql
-  - BROWSER=firefox DB=mysql51 TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
-  - BROWSER=firefox DB=mysql51 TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
-  - BROWSER=firefox DB=mysql51 TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
-  ## Use Plugins, Firefox, PostgreSQL
-  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=firefox,pgsql
-  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
-  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
-  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
-  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=front TARGET_ENV=firefox,pgsql
-  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
-  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
-  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
-  ## Use Plugins, Firefox, MySQL
-  - USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=front TARGET_ENV=firefox,mysql
-  - USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
-  - USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
-  - USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
-  - USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=front TARGET_ENV=firefox,mysql
-  - USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
-  - USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
-  - USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
+
   ## Chrome, PostgreSQL
   - BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
   - BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
diff --git a/tests/acceptance/EF03OrderMultiShippingCest.php b/tests/acceptance/EF03OrderMultiShippingCest.php
index 3703a4e..05259eb 100644
--- a/tests/acceptance/EF03OrderMultiShippingCest.php
+++ b/tests/acceptance/EF03OrderMultiShippingCest.php
@@ -67,15 +67,9 @@ public function order_MultiShipping_TwoType_OneAddress(\AcceptanceTester $i)
 
         // go to cart page
         $i->click('#main_middle .total_box .btn_group p a');
-
-        $test = $i->grabTextFrom('#main_middle #confirm_flow_box');
-
-        codecept_debug($test);
-
-        $i->assertEquals("配送方法が異なる商品が含まれているため、お届け先は複数となります。", $test);
-
+        
         // 確認
-        $i->see('配送方法が異なる商品が含まれているため、お届け先は複数となります。', '#main_middle #confirm_flow_box #confirm_flow_box__message--1 p');
+        $i->assertContains("配送方法が異なる商品が含まれているため、お届け先は複数となります。", $i->grabTextFrom('#main_middle #confirm_flow_box'));
         $i->see('ご注文内容のご確認', '#main_middle .page-heading');
         $i->see('お客様情報', '#main_middle #shopping-form #confirm_main');
         $i->see('配送情報', '#main_middle #shopping-form #confirm_main');

From 62fd36038805c6a259f4a7b7f79a1a90f3ac0bbb Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Tue, 14 May 2019 15:01:55 +0900
Subject: [PATCH 07/22] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/acceptance/EF01TopCest.php                | 5 +++++
 tests/acceptance/EF03OrderMultiShippingCest.php | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/acceptance/EF01TopCest.php b/tests/acceptance/EF01TopCest.php
index 8f88bb4..effcb33 100644
--- a/tests/acceptance/EF01TopCest.php
+++ b/tests/acceptance/EF01TopCest.php
@@ -80,6 +80,11 @@ public function topページ_新着情報(\AcceptanceTester $I)
         $I->haveInDatabase('dtb_news', array('news_id' => rand(999, 9999), 'news_date' => $today->format('Y-m-d 00:00:00'), 'news_title' => 'タイトル1', 'news_comment' => 'コメント1', 'creator_id' => 1, 'news_url' => 'http://www.ec-cube.net', 'rank' => 2, 'create_date' => $today->format('Y-m-d 00:00:00'), 'update_date' => $today->format('Y-m-d 00:00:00')));
         $I->reloadPage();
         $I->click('#news_area .newslist dt');
+
+        $test = $I->grabTextFrom('#news_area .newslist dd');
+
+        codecept_debug($test);
+
         $I->see('詳しくはこちら', '#news_area .newslist dd');
         $I->click('#news_area .newslist dd a');
         $I->seeInTitle('ECサイト構築・リニューアルは「ECオープンプラットフォームEC-CUBE」');
diff --git a/tests/acceptance/EF03OrderMultiShippingCest.php b/tests/acceptance/EF03OrderMultiShippingCest.php
index 05259eb..9493391 100644
--- a/tests/acceptance/EF03OrderMultiShippingCest.php
+++ b/tests/acceptance/EF03OrderMultiShippingCest.php
@@ -67,7 +67,7 @@ public function order_MultiShipping_TwoType_OneAddress(\AcceptanceTester $i)
 
         // go to cart page
         $i->click('#main_middle .total_box .btn_group p a');
-        
+
         // 確認
         $i->assertContains("配送方法が異なる商品が含まれているため、お届け先は複数となります。", $i->grabTextFrom('#main_middle #confirm_flow_box'));
         $i->see('ご注文内容のご確認', '#main_middle .page-heading');
@@ -145,7 +145,7 @@ public function order_MultiShipping_TwoType_TwoAddress(\AcceptanceTester $i)
         $i->wait(1);
 
         // 確認
-        $i->see('配送方法が異なる商品が含まれているため、お届け先は複数となります', '#main_middle #confirm_flow_box #confirm_flow_box__message--1 p');
+        $i->assertContains("配送方法が異なる商品が含まれているため、お届け先は複数となります。", $i->grabTextFrom('#main_middle #confirm_flow_box'));
         $i->see('ご注文内容のご確認', '#main_middle .page-heading');
         $i->see('お客様情報', '#main_middle #shopping-form #confirm_main');
         $i->see('配送情報', '#main_middle #shopping-form #confirm_main');

From 403d7b5f7da318d03cb9cf775228e97e1d4f801e Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Tue, 14 May 2019 15:55:37 +0900
Subject: [PATCH 08/22] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/acceptance/EA04OrderCest.php | 4 ++--
 tests/acceptance/EF01TopCest.php   | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/acceptance/EA04OrderCest.php b/tests/acceptance/EA04OrderCest.php
index 48ee067..bc2c1f4 100644
--- a/tests/acceptance/EA04OrderCest.php
+++ b/tests/acceptance/EA04OrderCest.php
@@ -227,7 +227,7 @@ public function order_受注メール通知(\AcceptanceTester $I)
 
         $OrderListPage->一覧_メール通知(1);
 
-        $I->selectOption(['id' => 'template-change'], ['1' => '注文受付メール']);
+        $I->selectOption(['id' => 'template-change'], '注文受付メール');
         $I->click(['css' => '#button_box__button_menu > button']);
         $I->click(['css' => '#confirm_box__button_menu > p:nth-child(2) > button']);
 
@@ -257,7 +257,7 @@ public function order_一括メール通知(\AcceptanceTester $I)
             ->一覧_全選択()
             ->メール一括通知();
 
-        $I->selectOption(['id' => 'template-change'], ['1' => '注文受付メール']);
+        $I->selectOption(['id' => 'template-change'], '注文受付メール');
         $I->click(['css' => '#top_box__button_menu > button']);
         $I->click(['css' => '#confirm_box__button_menu > p:nth-child(2) > button']);
 
diff --git a/tests/acceptance/EF01TopCest.php b/tests/acceptance/EF01TopCest.php
index effcb33..b70b892 100644
--- a/tests/acceptance/EF01TopCest.php
+++ b/tests/acceptance/EF01TopCest.php
@@ -81,10 +81,6 @@ public function topページ_新着情報(\AcceptanceTester $I)
         $I->reloadPage();
         $I->click('#news_area .newslist dt');
 
-        $test = $I->grabTextFrom('#news_area .newslist dd');
-
-        codecept_debug($test);
-
         $I->see('詳しくはこちら', '#news_area .newslist dd');
         $I->click('#news_area .newslist dd a');
         $I->seeInTitle('ECサイト構築・リニューアルは「ECオープンプラットフォームEC-CUBE」');

From a4aeb8f59cbdd5cee88155829c912da2f8e12b74 Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Tue, 14 May 2019 17:25:02 +0900
Subject: [PATCH 09/22] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/acceptance/EA04OrderCest.php | 4 ++--
 tests/acceptance/EF01TopCest.php   | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/acceptance/EA04OrderCest.php b/tests/acceptance/EA04OrderCest.php
index bc2c1f4..48ee067 100644
--- a/tests/acceptance/EA04OrderCest.php
+++ b/tests/acceptance/EA04OrderCest.php
@@ -227,7 +227,7 @@ public function order_受注メール通知(\AcceptanceTester $I)
 
         $OrderListPage->一覧_メール通知(1);
 
-        $I->selectOption(['id' => 'template-change'], '注文受付メール');
+        $I->selectOption(['id' => 'template-change'], ['1' => '注文受付メール']);
         $I->click(['css' => '#button_box__button_menu > button']);
         $I->click(['css' => '#confirm_box__button_menu > p:nth-child(2) > button']);
 
@@ -257,7 +257,7 @@ public function order_一括メール通知(\AcceptanceTester $I)
             ->一覧_全選択()
             ->メール一括通知();
 
-        $I->selectOption(['id' => 'template-change'], '注文受付メール');
+        $I->selectOption(['id' => 'template-change'], ['1' => '注文受付メール']);
         $I->click(['css' => '#top_box__button_menu > button']);
         $I->click(['css' => '#confirm_box__button_menu > p:nth-child(2) > button']);
 
diff --git a/tests/acceptance/EF01TopCest.php b/tests/acceptance/EF01TopCest.php
index b70b892..d9f8157 100644
--- a/tests/acceptance/EF01TopCest.php
+++ b/tests/acceptance/EF01TopCest.php
@@ -81,7 +81,12 @@ public function topページ_新着情報(\AcceptanceTester $I)
         $I->reloadPage();
         $I->click('#news_area .newslist dt');
 
-        $I->see('詳しくはこちら', '#news_area .newslist dd');
+        $test = $I->grabTextFrom('#news_area .newslist dd');
+
+        codecept_debug($test);
+
+        $I->assertContains("詳しくはこちら", $I->grabTextFrom('#news_area .newslist dd'));
+        $i->see('配送方法が異なる商品が含まれているため、お届け先は複数となります', '#news_area .newslist dd');
         $I->click('#news_area .newslist dd a');
         $I->seeInTitle('ECサイト構築・リニューアルは「ECオープンプラットフォームEC-CUBE」');
     }

From dede74e5f6424e6bcc55614ebb2083fbaf853303 Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Tue, 14 May 2019 17:40:08 +0900
Subject: [PATCH 10/22] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/acceptance/EA04OrderCest.php | 7 +++++--
 tests/acceptance/EF01TopCest.php   | 8 +-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/tests/acceptance/EA04OrderCest.php b/tests/acceptance/EA04OrderCest.php
index 48ee067..09d7bc5 100644
--- a/tests/acceptance/EA04OrderCest.php
+++ b/tests/acceptance/EA04OrderCest.php
@@ -227,7 +227,10 @@ public function order_受注メール通知(\AcceptanceTester $I)
 
         $OrderListPage->一覧_メール通知(1);
 
-        $I->selectOption(['id' => 'template-change'], ['1' => '注文受付メール']);
+
+        codecept_debug($I->grabTextFrom('#template-change'));
+
+        $I->selectOption(['id' => 'template-change'], '注文受付メール');
         $I->click(['css' => '#button_box__button_menu > button']);
         $I->click(['css' => '#confirm_box__button_menu > p:nth-child(2) > button']);
 
@@ -257,7 +260,7 @@ public function order_一括メール通知(\AcceptanceTester $I)
             ->一覧_全選択()
             ->メール一括通知();
 
-        $I->selectOption(['id' => 'template-change'], ['1' => '注文受付メール']);
+        $I->selectOption(['id' => 'template-change'], '注文受付メール');
         $I->click(['css' => '#top_box__button_menu > button']);
         $I->click(['css' => '#confirm_box__button_menu > p:nth-child(2) > button']);
 
diff --git a/tests/acceptance/EF01TopCest.php b/tests/acceptance/EF01TopCest.php
index d9f8157..173ff4d 100644
--- a/tests/acceptance/EF01TopCest.php
+++ b/tests/acceptance/EF01TopCest.php
@@ -80,13 +80,7 @@ public function topページ_新着情報(\AcceptanceTester $I)
         $I->haveInDatabase('dtb_news', array('news_id' => rand(999, 9999), 'news_date' => $today->format('Y-m-d 00:00:00'), 'news_title' => 'タイトル1', 'news_comment' => 'コメント1', 'creator_id' => 1, 'news_url' => 'http://www.ec-cube.net', 'rank' => 2, 'create_date' => $today->format('Y-m-d 00:00:00'), 'update_date' => $today->format('Y-m-d 00:00:00')));
         $I->reloadPage();
         $I->click('#news_area .newslist dt');
-
-        $test = $I->grabTextFrom('#news_area .newslist dd');
-
-        codecept_debug($test);
-
-        $I->assertContains("詳しくはこちら", $I->grabTextFrom('#news_area .newslist dd'));
-        $i->see('配送方法が異なる商品が含まれているため、お届け先は複数となります', '#news_area .newslist dd');
+        $I->see('コメント1', '#news_area .newslist dd');
         $I->click('#news_area .newslist dd a');
         $I->seeInTitle('ECサイト構築・リニューアルは「ECオープンプラットフォームEC-CUBE」');
     }

From e661a1e7705397b73827e2690723e5ddec520f0c Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Tue, 14 May 2019 18:00:11 +0900
Subject: [PATCH 11/22] =?UTF-8?q?EA04OrderCest=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/acceptance/EA04OrderCest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/acceptance/EA04OrderCest.php b/tests/acceptance/EA04OrderCest.php
index 09d7bc5..377d6a8 100644
--- a/tests/acceptance/EA04OrderCest.php
+++ b/tests/acceptance/EA04OrderCest.php
@@ -230,7 +230,7 @@ public function order_受注メール通知(\AcceptanceTester $I)
 
         codecept_debug($I->grabTextFrom('#template-change'));
 
-        $I->selectOption(['id' => 'template-change'], '注文受付メール');
+        $I->selectOption(['id' => 'template-change'], 'ご注文ありがとうございます');
         $I->click(['css' => '#button_box__button_menu > button']);
         $I->click(['css' => '#confirm_box__button_menu > p:nth-child(2) > button']);
 
@@ -260,7 +260,7 @@ public function order_一括メール通知(\AcceptanceTester $I)
             ->一覧_全選択()
             ->メール一括通知();
 
-        $I->selectOption(['id' => 'template-change'], '注文受付メール');
+        $I->selectOption(['id' => 'template-change'], 'ご注文ありがとうございます');
         $I->click(['css' => '#top_box__button_menu > button']);
         $I->click(['css' => '#confirm_box__button_menu > p:nth-child(2) > button']);
 

From e13c4f7911e402d42a6716adedb9bc74824abcdc Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Tue, 14 May 2019 18:26:00 +0900
Subject: [PATCH 12/22] EA07BasicinfoCest

---
 tests/acceptance/EA07BasicinfoCest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/acceptance/EA07BasicinfoCest.php b/tests/acceptance/EA07BasicinfoCest.php
index c314d8f..082432a 100644
--- a/tests/acceptance/EA07BasicinfoCest.php
+++ b/tests/acceptance/EA07BasicinfoCest.php
@@ -318,7 +318,7 @@ public function basicinfo_メール設定(\AcceptanceTester $I)
 
         // 表示
         MailSettingsPage::go($I)
-            ->入力_テンプレート('注文受付メール')
+            ->入力_テンプレート('ご注文ありがとうございます')
             ->入力_件名('ご注文有難うございました')
             ->登録();
 

From eef13416bd3f1c1617bdadb4907236bf7a7e594c Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Tue, 14 May 2019 18:36:51 +0900
Subject: [PATCH 13/22] =?UTF-8?q?MySQL=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E6=8C=87=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.mysql.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml
index dca2e70..4f199ca 100644
--- a/docker-compose.mysql.yml
+++ b/docker-compose.mysql.yml
@@ -1,7 +1,7 @@
 version: "2"
 services:
   db:
-    image: mysql:latest
+    image: mysql:5.7
     environment:
       - MYSQL_ROOT_PASSWORD=password
       - MYSQL_DATABASE=cube3_dev

From c6eff0e6a812f0dad834625f6c1c8fbe808e1713 Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Tue, 14 May 2019 18:37:58 +0900
Subject: [PATCH 14/22] =?UTF-8?q?.travis.yml=E3=82=92=E6=88=BB=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 729ea09..0191977 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,42 @@ services:
   - docker
 
 env:
-
+  ## Firefox, PostgreSQL
+  - BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=firefox,pgsql
+  - BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
+  - BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
+  - BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
+  - BROWSER=firefox DB=pgsql84 TARGET_GROUP=front TARGET_ENV=firefox,pgsql
+  - BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
+  - BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
+  - BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
+  ## Firefox, MySQL
+  - BROWSER=firefox DB=mysql TARGET_GROUP=front TARGET_ENV=firefox,mysql
+  - BROWSER=firefox DB=mysql TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
+  - BROWSER=firefox DB=mysql TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
+  - BROWSER=firefox DB=mysql TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
+  - BROWSER=firefox DB=mysql51 TARGET_GROUP=front TARGET_ENV=firefox,mysql
+  - BROWSER=firefox DB=mysql51 TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
+  - BROWSER=firefox DB=mysql51 TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
+  - BROWSER=firefox DB=mysql51 TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
+  ## Use Plugins, Firefox, PostgreSQL
+  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=firefox,pgsql
+  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
+  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
+  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
+  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=front TARGET_ENV=firefox,pgsql
+  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
+  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
+  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
+  ## Use Plugins, Firefox, MySQL
+  - USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=front TARGET_ENV=firefox,mysql
+  - USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
+  - USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
+  - USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
+  - USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=front TARGET_ENV=firefox,mysql
+  - USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
+  - USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
+  - USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
   ## Chrome, PostgreSQL
   - BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
   - BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql

From 0e2fcf2856a6010b29cc2d6a3e366eb4eb0ab26a Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Tue, 14 May 2019 18:38:18 +0900
Subject: [PATCH 15/22] =?UTF-8?q?chrome=E3=81=AB=E9=99=90=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml | 140 ++++++++++++++++++++++++++--------------------------
 1 file changed, 70 insertions(+), 70 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0191977..26fae0c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,42 +7,42 @@ services:
   - docker
 
 env:
-  ## Firefox, PostgreSQL
-  - BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=firefox,pgsql
-  - BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
-  - BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
-  - BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
-  - BROWSER=firefox DB=pgsql84 TARGET_GROUP=front TARGET_ENV=firefox,pgsql
-  - BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
-  - BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
-  - BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
-  ## Firefox, MySQL
-  - BROWSER=firefox DB=mysql TARGET_GROUP=front TARGET_ENV=firefox,mysql
-  - BROWSER=firefox DB=mysql TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
-  - BROWSER=firefox DB=mysql TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
-  - BROWSER=firefox DB=mysql TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
-  - BROWSER=firefox DB=mysql51 TARGET_GROUP=front TARGET_ENV=firefox,mysql
-  - BROWSER=firefox DB=mysql51 TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
-  - BROWSER=firefox DB=mysql51 TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
-  - BROWSER=firefox DB=mysql51 TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
-  ## Use Plugins, Firefox, PostgreSQL
-  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=firefox,pgsql
-  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
-  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
-  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
-  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=front TARGET_ENV=firefox,pgsql
-  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
-  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
-  - USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
-  ## Use Plugins, Firefox, MySQL
-  - USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=front TARGET_ENV=firefox,mysql
-  - USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
-  - USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
-  - USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
-  - USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=front TARGET_ENV=firefox,mysql
-  - USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
-  - USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
-  - USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
+  ## chrome, PostgreSQL
+  - BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
+  - BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
+  - BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
+  - BROWSER=chrome DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
+  - BROWSER=chrome DB=pgsql84 TARGET_GROUP=front TARGET_ENV=chrome,pgsql
+  - BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
+  - BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
+  - BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
+  ## chrome, MySQL
+  - BROWSER=chrome DB=mysql TARGET_GROUP=front TARGET_ENV=chrome,mysql
+  - BROWSER=chrome DB=mysql TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
+  - BROWSER=chrome DB=mysql TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
+  - BROWSER=chrome DB=mysql TARGET_GROUP=admin03 TARGET_ENV=chrome,mysql
+  - BROWSER=chrome DB=mysql51 TARGET_GROUP=front TARGET_ENV=chrome,mysql
+  - BROWSER=chrome DB=mysql51 TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
+  - BROWSER=chrome DB=mysql51 TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
+  - BROWSER=chrome DB=mysql51 TARGET_GROUP=admin03 TARGET_ENV=chrome,mysql
+  ## Use Plugins, chrome, PostgreSQL
+  - USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
+  - USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
+  - USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
+  - USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
+  - USE_PLUGIN=1 BROWSER=chrome DB=pgsql84 TARGET_GROUP=front TARGET_ENV=chrome,pgsql
+  - USE_PLUGIN=1 BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
+  - USE_PLUGIN=1 BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
+  - USE_PLUGIN=1 BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
+  ## Use Plugins, chrome, MySQL
+  - USE_PLUGIN=1 BROWSER=chrome DB=mysql TARGET_GROUP=front TARGET_ENV=chrome,mysql
+  - USE_PLUGIN=1 BROWSER=chrome DB=mysql TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
+  - USE_PLUGIN=1 BROWSER=chrome DB=mysql TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
+  - USE_PLUGIN=1 BROWSER=chrome DB=mysql TARGET_GROUP=admin03 TARGET_ENV=chrome,mysql
+  - USE_PLUGIN=1 BROWSER=chrome DB=mysql51 TARGET_GROUP=front TARGET_ENV=chrome,mysql
+  - USE_PLUGIN=1 BROWSER=chrome DB=mysql51 TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
+  - USE_PLUGIN=1 BROWSER=chrome DB=mysql51 TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
+  - USE_PLUGIN=1 BROWSER=chrome DB=mysql51 TARGET_GROUP=admin03 TARGET_ENV=chrome,mysql
   ## Chrome, PostgreSQL
   - BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
   - BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
@@ -53,16 +53,16 @@ env:
   - BROWSER=chrome DB=mysql TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
   - BROWSER=chrome DB=mysql TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
   - BROWSER=chrome DB=mysql TARGET_GROUP=admin03 TARGET_ENV=chrome,mysql
-  ## Sub Direcotry, Firefox, PostgreSQL
-  - DIRTYPE=subdir BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=firefox,pgsql
-  - DIRTYPE=subdir BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
-  - DIRTYPE=subdir BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
-  - DIRTYPE=subdir BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
-  ## Without html directory, Firefox, PostgreSQL
-  - DIRTYPE=withouthtml BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=firefox,pgsql
-  - DIRTYPE=withouthtml BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
-  - DIRTYPE=withouthtml BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
-  - DIRTYPE=withouthtml BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
+  ## Sub Direcotry, chrome, PostgreSQL
+  - DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
+  - DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
+  - DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
+  - DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
+  ## Without html directory, chrome, PostgreSQL
+  - DIRTYPE=withouthtml BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
+  - DIRTYPE=withouthtml BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
+  - DIRTYPE=withouthtml BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
+  - DIRTYPE=withouthtml BROWSER=chrome DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
 
 matrix:
   fast_finish: true
@@ -75,30 +75,30 @@ matrix:
     - env: BROWSER=chrome DB=mysql TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
     - env: BROWSER=chrome DB=mysql TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
     - env: BROWSER=chrome DB=mysql TARGET_GROUP=admin03 TARGET_ENV=chrome,mysql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=firefox,pgsql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=front TARGET_ENV=firefox,pgsql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=front TARGET_ENV=firefox,mysql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=front TARGET_ENV=firefox,mysql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
-    - env: DIRTYPE=subdir BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=firefox,pgsql
-    - env: DIRTYPE=subdir BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
-    - env: DIRTYPE=subdir BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
-    - env: DIRTYPE=subdir BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
-    - env: DIRTYPE=withouthtml BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=firefox,pgsql
-    - env: DIRTYPE=withouthtml BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
-    - env: DIRTYPE=withouthtml BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
-    - env: DIRTYPE=withouthtml BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql84 TARGET_GROUP=front TARGET_ENV=chrome,pgsql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql TARGET_GROUP=front TARGET_ENV=chrome,mysql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql TARGET_GROUP=admin03 TARGET_ENV=chrome,mysql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql51 TARGET_GROUP=front TARGET_ENV=chrome,mysql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql51 TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql51 TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql51 TARGET_GROUP=admin03 TARGET_ENV=chrome,mysql
+    - env: DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
+    - env: DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
+    - env: DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
+    - env: DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
+    - env: DIRTYPE=withouthtml BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
+    - env: DIRTYPE=withouthtml BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
+    - env: DIRTYPE=withouthtml BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
+    - env: DIRTYPE=withouthtml BROWSER=chrome DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
 
 before_install:
     - docker-compose -f docker-compose.yml ${DIRTYPE:+-f docker-compose.${DIRTYPE}.yml} -f docker-compose.${BROWSER}.yml -f docker-compose.${DB}.yml --project-name ${BROWSER}_${DB}_${TARGET_GROUP} build --no-cache

From 2385f1aadc3f3bc3073498c4914ae0d8c14dc2c0 Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Wed, 15 May 2019 11:29:15 +0900
Subject: [PATCH 16/22] =?UTF-8?q?.env=E3=81=AE=E5=A4=89=E6=9B=B4=E3=82=92?=
 =?UTF-8?q?=E6=88=BB=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env b/.env
index d5beba4..124f289 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-ECCUBE_BRANCH=3.0.18_version
-ECCUBE_REPOS=https://github.com/kazumiiiiiiiiiii/ec-cube.git
+ECCUBE_BRANCH=master
+ECCUBE_REPOS=https://github.com/EC-CUBE/ec-cube.git
 ECCUBE_BASE_URL=http://eccube3/
 

From b5f8c228b6976bdde56f93969687fb871890eb08 Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Wed, 15 May 2019 11:39:16 +0900
Subject: [PATCH 17/22] =?UTF-8?q?.travis.yml=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 26fae0c..46942a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -75,30 +75,30 @@ matrix:
     - env: BROWSER=chrome DB=mysql TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
     - env: BROWSER=chrome DB=mysql TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
     - env: BROWSER=chrome DB=mysql TARGET_GROUP=admin03 TARGET_ENV=chrome,mysql
-    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
-    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
-    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
-    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
-    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql84 TARGET_GROUP=front TARGET_ENV=chrome,pgsql
-    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
-    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
-    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
-    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql TARGET_GROUP=front TARGET_ENV=chrome,mysql
-    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
-    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
-    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql TARGET_GROUP=admin03 TARGET_ENV=chrome,mysql
-    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql51 TARGET_GROUP=front TARGET_ENV=chrome,mysql
-    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql51 TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
-    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql51 TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
-    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql51 TARGET_GROUP=admin03 TARGET_ENV=chrome,mysql
-    - env: DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
-    - env: DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
-    - env: DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
-    - env: DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
-    - env: DIRTYPE=withouthtml BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
-    - env: DIRTYPE=withouthtml BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
-    - env: DIRTYPE=withouthtml BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
-    - env: DIRTYPE=withouthtml BROWSER=chrome DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
+    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=firefox,pgsql
+    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
+    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
+    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
+    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=front TARGET_ENV=firefox,pgsql
+    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
+    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
+    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
+    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=front TARGET_ENV=firefox,mysql
+    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
+    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
+    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
+    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=front TARGET_ENV=firefox,mysql
+    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
+    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
+    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
+    - env: DIRTYPE=subdir BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=firefox,pgsql
+    - env: DIRTYPE=subdir BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
+    - env: DIRTYPE=subdir BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
+    - env: DIRTYPE=subdir BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
+    - env: DIRTYPE=withouthtml BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=firefox,pgsql
+    - env: DIRTYPE=withouthtml BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
+    - env: DIRTYPE=withouthtml BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
+    - env: DIRTYPE=withouthtml BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
 
 before_install:
     - docker-compose -f docker-compose.yml ${DIRTYPE:+-f docker-compose.${DIRTYPE}.yml} -f docker-compose.${BROWSER}.yml -f docker-compose.${DB}.yml --project-name ${BROWSER}_${DB}_${TARGET_GROUP} build --no-cache

From 26091f12935769aff42dc803388056473630cd8f Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Wed, 15 May 2019 11:55:36 +0900
Subject: [PATCH 18/22] =?UTF-8?q?EA04OrderCest=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/acceptance/EA04OrderCest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/acceptance/EA04OrderCest.php b/tests/acceptance/EA04OrderCest.php
index 377d6a8..c15da83 100644
--- a/tests/acceptance/EA04OrderCest.php
+++ b/tests/acceptance/EA04OrderCest.php
@@ -230,7 +230,7 @@ public function order_受注メール通知(\AcceptanceTester $I)
 
         codecept_debug($I->grabTextFrom('#template-change'));
 
-        $I->selectOption(['id' => 'template-change'], 'ご注文ありがとうございます');
+        $I->selectOption(['id' => 'template-change'], ['1' => 'ご注文ありがとうございます']);
         $I->click(['css' => '#button_box__button_menu > button']);
         $I->click(['css' => '#confirm_box__button_menu > p:nth-child(2) > button']);
 
@@ -260,7 +260,7 @@ public function order_一括メール通知(\AcceptanceTester $I)
             ->一覧_全選択()
             ->メール一括通知();
 
-        $I->selectOption(['id' => 'template-change'], 'ご注文ありがとうございます');
+        $I->selectOption(['id' => 'template-change'], ['1' => 'ご注文ありがとうございます']);
         $I->click(['css' => '#top_box__button_menu > button']);
         $I->click(['css' => '#confirm_box__button_menu > p:nth-child(2) > button']);
 

From a94b2f288bed1e12b06ba416bf5fa8d6b6d31606 Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Wed, 15 May 2019 11:55:48 +0900
Subject: [PATCH 19/22] =?UTF-8?q?.travis.yml=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml | 96 ++++++++++++++++++++++++++---------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 46942a9..f71abea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ services:
   - docker
 
 env:
-  ## chrome, PostgreSQL
+  ## Chrome, PostgreSQL
   - BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
   - BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
   - BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
@@ -16,7 +16,7 @@ env:
   - BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
   - BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
   - BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
-  ## chrome, MySQL
+  ## Chrome, MySQL
   - BROWSER=chrome DB=mysql TARGET_GROUP=front TARGET_ENV=chrome,mysql
   - BROWSER=chrome DB=mysql TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
   - BROWSER=chrome DB=mysql TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
@@ -25,7 +25,7 @@ env:
   - BROWSER=chrome DB=mysql51 TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
   - BROWSER=chrome DB=mysql51 TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
   - BROWSER=chrome DB=mysql51 TARGET_GROUP=admin03 TARGET_ENV=chrome,mysql
-  ## Use Plugins, chrome, PostgreSQL
+  ## Use Plugins, Chrome, PostgreSQL
   - USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
   - USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
   - USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
@@ -34,7 +34,7 @@ env:
   - USE_PLUGIN=1 BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
   - USE_PLUGIN=1 BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
   - USE_PLUGIN=1 BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
-  ## Use Plugins, chrome, MySQL
+  ## Use Plugins, Chrome, MySQL
   - USE_PLUGIN=1 BROWSER=chrome DB=mysql TARGET_GROUP=front TARGET_ENV=chrome,mysql
   - USE_PLUGIN=1 BROWSER=chrome DB=mysql TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
   - USE_PLUGIN=1 BROWSER=chrome DB=mysql TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
@@ -43,22 +43,22 @@ env:
   - USE_PLUGIN=1 BROWSER=chrome DB=mysql51 TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
   - USE_PLUGIN=1 BROWSER=chrome DB=mysql51 TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
   - USE_PLUGIN=1 BROWSER=chrome DB=mysql51 TARGET_GROUP=admin03 TARGET_ENV=chrome,mysql
-  ## Chrome, PostgreSQL
-  - BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
-  - BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
-  - BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
-  - BROWSER=chrome DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
-  ## Chrome, MySQL
-  - BROWSER=chrome DB=mysql TARGET_GROUP=front TARGET_ENV=chrome,mysql
-  - BROWSER=chrome DB=mysql TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
-  - BROWSER=chrome DB=mysql TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
-  - BROWSER=chrome DB=mysql TARGET_GROUP=admin03 TARGET_ENV=chrome,mysql
-  ## Sub Direcotry, chrome, PostgreSQL
+  ## Firefox, PostgreSQL
+  - BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=firefox,pgsql
+  - BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
+  - BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
+  - BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
+  ## Firefox, MySQL
+  - BROWSER=firefox DB=mysql TARGET_GROUP=front TARGET_ENV=firefox,mysql
+  - BROWSER=firefox DB=mysql TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
+  - BROWSER=firefox DB=mysql TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
+  - BROWSER=firefox DB=mysql TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
+  ## Sub Direcotry, Chrome, PostgreSQL
   - DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
   - DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
   - DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
   - DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
-  ## Without html directory, chrome, PostgreSQL
+  ## Without html directory, Chrome, PostgreSQL
   - DIRTYPE=withouthtml BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
   - DIRTYPE=withouthtml BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
   - DIRTYPE=withouthtml BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
@@ -67,38 +67,38 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
-    - env: BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
-    - env: BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
-    - env: BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
-    - env: BROWSER=chrome DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
-    - env: BROWSER=chrome DB=mysql TARGET_GROUP=front TARGET_ENV=chrome,mysql
-    - env: BROWSER=chrome DB=mysql TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
-    - env: BROWSER=chrome DB=mysql TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
-    - env: BROWSER=chrome DB=mysql TARGET_GROUP=admin03 TARGET_ENV=chrome,mysql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=firefox,pgsql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=front TARGET_ENV=firefox,pgsql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=pgsql84 TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=front TARGET_ENV=firefox,mysql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=front TARGET_ENV=firefox,mysql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
-    - env: USE_PLUGIN=1 BROWSER=firefox DB=mysql51 TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
-    - env: DIRTYPE=subdir BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=firefox,pgsql
-    - env: DIRTYPE=subdir BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
-    - env: DIRTYPE=subdir BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
-    - env: DIRTYPE=subdir BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
-    - env: DIRTYPE=withouthtml BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=firefox,pgsql
-    - env: DIRTYPE=withouthtml BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
-    - env: DIRTYPE=withouthtml BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
-    - env: DIRTYPE=withouthtml BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
+    - env: BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
+    - env: BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
+    - env: BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
+    - env: BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
+    - env: BROWSER=firefox DB=mysql TARGET_GROUP=front TARGET_ENV=chrome,mysql
+    - env: BROWSER=firefox DB=mysql TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
+    - env: BROWSER=firefox DB=mysql TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
+    - env: BROWSER=firefox DB=mysql TARGET_GROUP=admin03 TARGET_ENV=chrome,mysql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql84 TARGET_GROUP=front TARGET_ENV=chrome,pgsql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql84 TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql TARGET_GROUP=front TARGET_ENV=chrome,mysql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql TARGET_GROUP=admin03 TARGET_ENV=chrome,mysql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql51 TARGET_GROUP=front TARGET_ENV=chrome,mysql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql51 TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql51 TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
+    - env: USE_PLUGIN=1 BROWSER=chrome DB=mysql51 TARGET_GROUP=admin03 TARGET_ENV=chrome,mysql
+    - env: DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
+    - env: DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
+    - env: DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
+    - env: DIRTYPE=subdir BROWSER=chrome DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
+    - env: DIRTYPE=withouthtml BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
+    - env: DIRTYPE=withouthtml BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
+    - env: DIRTYPE=withouthtml BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
+    - env: DIRTYPE=withouthtml BROWSER=chrome DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
 
 before_install:
     - docker-compose -f docker-compose.yml ${DIRTYPE:+-f docker-compose.${DIRTYPE}.yml} -f docker-compose.${BROWSER}.yml -f docker-compose.${DB}.yml --project-name ${BROWSER}_${DB}_${TARGET_GROUP} build --no-cache

From 19b3ba830618fff020004094dee9446b008a1820 Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Wed, 15 May 2019 11:58:19 +0900
Subject: [PATCH 20/22] =?UTF-8?q?EA04OrderCest=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/acceptance/EA04OrderCest.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/acceptance/EA04OrderCest.php b/tests/acceptance/EA04OrderCest.php
index c15da83..46c2cf8 100644
--- a/tests/acceptance/EA04OrderCest.php
+++ b/tests/acceptance/EA04OrderCest.php
@@ -227,9 +227,6 @@ public function order_受注メール通知(\AcceptanceTester $I)
 
         $OrderListPage->一覧_メール通知(1);
 
-
-        codecept_debug($I->grabTextFrom('#template-change'));
-
         $I->selectOption(['id' => 'template-change'], ['1' => 'ご注文ありがとうございます']);
         $I->click(['css' => '#button_box__button_menu > button']);
         $I->click(['css' => '#confirm_box__button_menu > p:nth-child(2) > button']);

From 6b966e0e6055f16b1df5bda5a55c19ef9290dfff Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Wed, 15 May 2019 12:00:39 +0900
Subject: [PATCH 21/22] =?UTF-8?q?.travis.yml=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f71abea..9a31b99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,14 +67,14 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
-    - env: BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
-    - env: BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
-    - env: BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql
-    - env: BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=chrome,pgsql
-    - env: BROWSER=firefox DB=mysql TARGET_GROUP=front TARGET_ENV=chrome,mysql
-    - env: BROWSER=firefox DB=mysql TARGET_GROUP=admin01 TARGET_ENV=chrome,mysql
-    - env: BROWSER=firefox DB=mysql TARGET_GROUP=admin02 TARGET_ENV=chrome,mysql
-    - env: BROWSER=firefox DB=mysql TARGET_GROUP=admin03 TARGET_ENV=chrome,mysql
+    - env: BROWSER=firefox DB=pgsql TARGET_GROUP=front TARGET_ENV=firefox,pgsql
+    - env: BROWSER=firefox DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=firefox,pgsql
+    - env: BROWSER=firefox DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=firefox,pgsql
+    - env: BROWSER=firefox DB=pgsql TARGET_GROUP=admin03 TARGET_ENV=firefox,pgsql
+    - env: BROWSER=firefox DB=mysql TARGET_GROUP=front TARGET_ENV=firefox,mysql
+    - env: BROWSER=firefox DB=mysql TARGET_GROUP=admin01 TARGET_ENV=firefox,mysql
+    - env: BROWSER=firefox DB=mysql TARGET_GROUP=admin02 TARGET_ENV=firefox,mysql
+    - env: BROWSER=firefox DB=mysql TARGET_GROUP=admin03 TARGET_ENV=firefox,mysql
     - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=front TARGET_ENV=chrome,pgsql
     - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=admin01 TARGET_ENV=chrome,pgsql
     - env: USE_PLUGIN=1 BROWSER=chrome DB=pgsql TARGET_GROUP=admin02 TARGET_ENV=chrome,pgsql

From 898b7e1e6cd196b1dfeb1cf5fe0afbcc04db0fcc Mon Sep 17 00:00:00 2001
From: kazumi_watanabe <kazumi_watanabe@lockon.co.jp>
Date: Wed, 15 May 2019 13:23:08 +0900
Subject: [PATCH 22/22] =?UTF-8?q?.env=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env b/.env
index 124f289..339c57f 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-ECCUBE_BRANCH=master
+ECCUBE_BRANCH=3.0
 ECCUBE_REPOS=https://github.com/EC-CUBE/ec-cube.git
 ECCUBE_BASE_URL=http://eccube3/