Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.0.18に合わせたcodeceptionの修正 #157

Merged
merged 22 commits into from
May 15, 2019
Merged

3.0.18に合わせたcodeceptionの修正 #157

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c6b18f6
.envの修正
May 14, 2019
b603d62
selector修正
May 14, 2019
6467c91
selectorの修正
May 14, 2019
f8b1c1e
エラー出力の確認
May 14, 2019
b3f5a40
debug
May 14, 2019
361c233
テストの修正
May 14, 2019
62fd360
テストの修正
May 14, 2019
403d7b5
テストの修正
May 14, 2019
a4aeb8f
テストの修正
May 14, 2019
dede74e
テストの修正
May 14, 2019
e661a1e
EA04OrderCest修正
May 14, 2019
e13c4f7
EA07BasicinfoCest
May 14, 2019
eef1341
MySQLバージョン指定
May 14, 2019
c6eff0e
.travis.ymlを戻す
May 14, 2019
0e2fcf2
chromeに限定
May 14, 2019
2385f1a
.envの変更を戻す
May 15, 2019
b5f8c22
.travis.yml修正
May 15, 2019
26091f1
EA04OrderCest修正
May 15, 2019
a94b2f2
.travis.yml修正
May 15, 2019
19b3ba8
EA04OrderCest修正
May 15, 2019
6b966e0
.travis.yml修正
May 15, 2019
898b7e1
.envの修正
May 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/

140 changes: 70 additions & 70 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,42 +7,42 @@ services:
- docker

env:
## Firefox, PostgreSQL
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

すべてchromeになってしまっているので、firefoxはallow_failuresで残しておいて下さい。

- 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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.mysql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "2"
services:
db:
image: mysql:latest
image: mysql:5.7
environment:
- MYSQL_ROOT_PASSWORD=password
- MYSQL_DATABASE=cube3_dev
Expand Down
7 changes: 5 additions & 2 deletions tests/acceptance/EA04OrderCest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'], 'ご注文ありがとうございます');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

selectOption の第二引数は値だけだと選択するのに時間がかかるので ['id' => 'value'] の形でお願いします。

$I->click(['css' => '#button_box__button_menu > button']);
$I->click(['css' => '#confirm_box__button_menu > p:nth-child(2) > button']);

Expand Down Expand Up @@ -257,7 +260,7 @@ public function order_一括メール通知(\AcceptanceTester $I)
->一覧_全選択()
->メール一括通知();

$I->selectOption(['id' => 'template-change'], ['1' => '注文受付メール']);
$I->selectOption(['id' => 'template-change'], 'ご注文ありがとうございます');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

selectOption の第二引数は値だけだと選択するのに時間がかかるので ['id' => 'value'] の形でお願いします。

$I->click(['css' => '#top_box__button_menu > button']);
$I->click(['css' => '#confirm_box__button_menu > p:nth-child(2) > button']);

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/EA07BasicinfoCest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ public function basicinfo_メール設定(\AcceptanceTester $I)

// 表示
MailSettingsPage::go($I)
->入力_テンプレート('注文受付メール')
->入力_テンプレート('ご注文ありがとうございます')
->入力_件名('ご注文有難うございました')
->登録();

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/EF01TopCest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +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');
$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」');
}
Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance/EF03OrderMultiShippingCest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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->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');
Expand Down Expand Up @@ -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');
Expand Down