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

Apply composer update to 4.1-core #5001

Merged
merged 5 commits into from
Apr 12, 2021
Merged

Apply composer update to 4.1-core #5001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1dafd58
Apply composer update
nanasess Apr 5, 2021
6f44865
Tag は配列で渡すのが正しい
nanasess Apr 6, 2021
e8d6612
Fix seeEmailCount
nanasess Apr 6, 2021
7c50595
Merge remote-tracking branch 'upstream/4.1-core' into composer-update…
nanasess Apr 6, 2021
a12b1f5
Sex は配列で渡すのが正しい
nanasess Apr 6, 2021
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
12 changes: 9 additions & 3 deletions codeception/acceptance/EA04OrderCest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,9 @@ public function order_受注メール通知(AcceptanceTester $I)
OrderManagePage::go($I)
->一覧_メール通知(1);

$I->seeEmailCount(2);
$message = $I->lastMessage();
$I->assertCount(2, $message['recipients'], 'Bcc で管理者にも送信するので宛先アドレスは2つ');
$I->seeEmailCount(1);

$I->seeInLastEmailSubjectTo('admin@example.com', '[EC-CUBE SHOP] 商品出荷のお知らせ');
}
Expand All @@ -252,7 +254,9 @@ public function order_一括メール通知(AcceptanceTester $I)
->一覧_全選択()
->一括メール送信();

$I->seeEmailCount(20);
$message = $I->lastMessage();
$I->assertCount(2, $message['recipients'], 'Bcc で管理者にも送信するので宛先アドレスは2つ');
$I->seeEmailCount(10);
}

public function order_受注登録(AcceptanceTester $I)
Expand Down Expand Up @@ -439,7 +443,9 @@ public function order_個別出荷済みステータス変更(AcceptanceTester $
->出荷済にする(1);

$I->wait(5);
$I->seeEmailCount(2);
$message = $I->lastMessage();
$I->assertCount(2, $message['recipients'], 'Bcc で管理者にも送信するので宛先アドレスは2つ');
$I->seeEmailCount(1);
$I->seeInLastEmailSubjectTo('admin@example.com', '[EC-CUBE SHOP] 商品出荷のお知らせ');

OrderManagePage::go($I)->受注ステータス検索(OrderStatus::NEW);
Expand Down
5 changes: 4 additions & 1 deletion codeception/acceptance/EA05CustomerCest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,10 @@ public function customer_仮会員メール再送(AcceptanceTester $I)
->一覧_仮会員メール再送(1);
$I->wait(5);

$I->seeEmailCount(2);
$message = $I->lastMessage();
$I->assertCount(2, $message['recipients'], 'Bcc で管理者にも送信するので宛先アドレスは2つ');
$I->seeEmailCount(1);

foreach ([$customer->getEmail(), $BaseInfo->getEmail01()] as $email) {
$I->seeInLastEmailSubjectTo($email, '会員登録のご確認');
$I->seeInLastEmailTo($email, $customer->getName01().' '.$customer->getName02().' 様');
Expand Down
28 changes: 21 additions & 7 deletions codeception/acceptance/EF03OrderCest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,9 @@ public function order_ログインユーザ購入(AcceptanceTester $I)
$I->wait(1);

// メール確認
$I->seeEmailCount(2);
$message = $I->lastMessage();
$I->assertCount(2, $message['recipients'], 'Bcc で管理者にも送信するので宛先アドレスは2つ');
$I->seeEmailCount(1);
foreach ([$customer->getEmail(), $BaseInfo->getEmail01()] as $email) {
// TODO 注文した商品の内容もチェックしたい
$I->seeInLastEmailSubjectTo($email, 'ご注文ありがとうございます');
Expand Down Expand Up @@ -222,7 +224,9 @@ public function order_ゲスト購入(AcceptanceTester $I)
$I->wait(1);

// 確認
$I->seeEmailCount(2);
$message = $I->lastMessage();
$I->assertCount(2, $message['recipients'], 'Bcc で管理者にも送信するので宛先アドレスは2つ');
$I->seeEmailCount(1);
foreach ([$new_email, $BaseInfo->getEmail01()] as $email) {
// TODO 注文した商品の内容もチェックしたい
$I->seeInLastEmailSubjectTo($email, 'ご注文ありがとうございます');
Expand Down Expand Up @@ -302,7 +306,9 @@ public function order_ゲスト購入情報変更(AcceptanceTester $I)
ShoppingPage::at($I)->確認する();
ShoppingConfirmPage::at($I)->注文する();

$I->seeEmailCount(2);
$message = $I->lastMessage();
$I->assertCount(2, $message['recipients'], 'Bcc で管理者にも送信するので宛先アドレスは2つ');
$I->seeEmailCount(1);
foreach ([$new_email, $BaseInfo->getEmail01()] as $email) {
// TODO 注文した商品の内容もチェックしたい
$I->seeInLastEmailSubjectTo($email, 'ご注文ありがとうございます');
Expand Down Expand Up @@ -364,7 +370,9 @@ public function order_ログインしてカートをマージ(AcceptanceTester $
$I->wait(1);

// メール確認
$I->seeEmailCount(2);
$message = $I->lastMessage();
$I->assertCount(2, $message['recipients'], 'Bcc で管理者にも送信するので宛先アドレスは2つ');
$I->seeEmailCount(1);
foreach ([$customer->getEmail(), $BaseInfo->getEmail01()] as $email) {
$I->seeInLastEmailSubjectTo($email, 'ご注文ありがとうございます');
$I->seeInLastEmailTo($email, $customer->getName01().' '.$customer->getName02().' 様');
Expand Down Expand Up @@ -503,7 +511,9 @@ public function order_ログインユーザ購入複数配送(AcceptanceTester $
$I->wait(1);

// メール確認
$I->seeEmailCount(2);
$message = $I->lastMessage();
$I->assertCount(2, $message['recipients'], 'Bcc で管理者にも送信するので宛先アドレスは2つ');
$I->seeEmailCount(1);
foreach ([$customer->getEmail(), $BaseInfo->getEmail01()] as $email) {
$I->seeInLastEmailSubjectTo($email, 'ご注文ありがとうございます');
$I->seeInLastEmailTo($email, $customer->getName01().' '.$customer->getName02().' 様');
Expand Down Expand Up @@ -710,7 +720,9 @@ public function order_購入確認画面からカートに戻る(AcceptanceTeste
$I->wait(1);

// メール確認
$I->seeEmailCount(2);
$message = $I->lastMessage();
$I->assertCount(2, $message['recipients'], 'Bcc で管理者にも送信するので宛先アドレスは2つ');
$I->seeEmailCount(1);
foreach ([$customer->getEmail(), $BaseInfo->getEmail01()] as $email) {
$I->seeInLastEmailSubjectTo($email, 'ご注文ありがとうございます');
$I->seeInLastEmailTo($email, $customer->getName01().' '.$customer->getName02().' 様');
Expand Down Expand Up @@ -870,7 +882,9 @@ public function order_購入確認画面からカートに戻るWithお届け先
$I->wait(1);

// メール確認
$I->seeEmailCount(2);
$message = $I->lastMessage();
$I->assertCount(2, $message['recipients'], 'Bcc で管理者にも送信するので宛先アドレスは2つ');
$I->seeEmailCount(1);
foreach ([$customer->getEmail(), $BaseInfo->getEmail01()] as $email) {
$I->seeInLastEmailSubjectTo($email, 'ご注文ありがとうございます');
$I->seeInLastEmailTo($email, $customer->getName01().' '.$customer->getName02().' 様');
Expand Down
8 changes: 6 additions & 2 deletions codeception/acceptance/EF04CustomerCest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ public function customer_会員登録正常(AcceptanceTester $I)
// 「会員登録をする」ボタンを押下する
$I->click('.ec-registerRole form button.ec-blockBtn--action');

$I->seeEmailCount(2);
$message = $I->lastMessage();
$I->assertCount(2, $message['recipients'], 'Bcc で管理者にも送信するので宛先アドレスは2つ');
$I->seeEmailCount(1);
foreach ([$new_email, $BaseInfo->getEmail01()] as $email) {
$I->seeInLastEmailSubjectTo($email, '会員登録のご確認');
$I->seeInLastEmailTo($email, '姓 名 様');
Expand All @@ -82,7 +84,9 @@ public function customer_会員登録正常(AcceptanceTester $I)
$I->amOnPage($activateUrl);
$I->see('新規会員登録(完了)', 'div.ec-pageHeader h1');

$I->seeEmailCount(2);
$message = $I->lastMessage();
$I->assertCount(2, $message['recipients'], 'Bcc で管理者にも送信するので宛先アドレスは2つ');
$I->seeEmailCount(1);
foreach ([$new_email, $BaseInfo->getEmail01()] as $email) {
$I->seeInLastEmailSubjectTo($email, '会員登録が完了しました。');
$I->seeInLastEmailTo($email, '姓 名 様');
Expand Down
4 changes: 3 additions & 1 deletion codeception/acceptance/EF06OtherCest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,9 @@ public function other_お問い合わせ1(AcceptanceTester $I)
$I->see('お問い合わせ(完了)', 'div.ec-pageHeader h1');

// メールチェック
$I->seeEmailCount(2);
$message = $I->lastMessage();
$I->assertCount(2, $message['recipients'], 'Bcc で管理者にも送信するので宛先アドレスは2つ');
$I->seeEmailCount(1);
foreach ([$new_email, $BaseInfo->getEmail01()] as $email) {
$I->seeInLastEmailSubjectTo($email, 'お問い合わせを受け付けました');
$I->seeInLastEmailTo($email, '姓 名 様');
Expand Down
1 change: 0 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@
]
},
"conflict": {
"symfony/debug": "3.4.4",
Copy link
Contributor

Choose a reason for hiding this comment

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

こちらの対策していただいていました。Symfony4.4では不要。
#2807 (comment)

"symfony/symfony": "*",
"easycorp/easy-log-handler": "1.0.4|1.0.5"
},
Expand Down
Loading