From d61ef594bcd390d912e775e8b8a80759a1e3b9ef Mon Sep 17 00:00:00 2001 From: Jakub Tobiasz Date: Wed, 28 Jun 2023 10:20:14 +0200 Subject: [PATCH] Provide post-CR fixes --- .../receiving_email_after_registration.feature | 2 +- src/Sylius/Behat/Context/Api/EmailContext.php | 2 +- .../Behat/Context/Api/Shop/RegistrationContext.php | 14 +++----------- .../Checkout/RegistrationAfterCheckoutContext.php | 2 +- .../Shop/Account/RegisterThankYouPageInterface.php | 1 - 5 files changed, 6 insertions(+), 15 deletions(-) diff --git a/features/account/receiving_email_after_registration.feature b/features/account/receiving_email_after_registration.feature index 175ec12436c5..cd8cbe2f1483 100644 --- a/features/account/receiving_email_after_registration.feature +++ b/features/account/receiving_email_after_registration.feature @@ -21,7 +21,7 @@ Feature: Receiving a welcoming email after registration When I register with email "ghastly@bespoke.com" and password "suitsarelife" Then only one email should have been sent to "ghastly@bespoke.com" And a verification email should have been sent to "ghastly@bespoke.com" - And a welcoming email should not have been sent to "ghastly@bespoke.com" + But a welcoming email should not have been sent to "ghastly@bespoke.com" @ui @email @api Scenario: Receiving a welcoming email after registration in different locale than the default one diff --git a/src/Sylius/Behat/Context/Api/EmailContext.php b/src/Sylius/Behat/Context/Api/EmailContext.php index 606c5820e386..d796cbaac784 100644 --- a/src/Sylius/Behat/Context/Api/EmailContext.php +++ b/src/Sylius/Behat/Context/Api/EmailContext.php @@ -192,7 +192,7 @@ public function recipientShouldReceiveNoEmails(string $recipient): void } /** - * @Then /^only one email should have been sent to "([^"]*)"$/ + * @Then only one email should have been sent to :recipientEmail */ public function onlyOneEmailShouldHaveBeenSentTo(string $recipient): void { diff --git a/src/Sylius/Behat/Context/Api/Shop/RegistrationContext.php b/src/Sylius/Behat/Context/Api/Shop/RegistrationContext.php index 60105c7a0664..30b3a335eb01 100644 --- a/src/Sylius/Behat/Context/Api/Shop/RegistrationContext.php +++ b/src/Sylius/Behat/Context/Api/Shop/RegistrationContext.php @@ -252,19 +252,11 @@ public function iShouldBeSubscribedToTheNewsletter(): void } /** - * @Then /^I should be on registration thank you page$/ + * @Then I should be on my account dashboard + * @Then I should be on registration thank you page */ - public function iShouldBeOnRegistrationThankYouPage(): void + public function intentionallyLeftBlank(): void { - // Intentionally left blank - } - - /** - * @Then /^I should be on my account dashboard/ - */ - public function iShouldBeOnMyAccountDashboard(): void - { - // Intentionally left blank } private function assertFieldValidationMessage(string $path, string $message): void diff --git a/src/Sylius/Behat/Context/Ui/Shop/Checkout/RegistrationAfterCheckoutContext.php b/src/Sylius/Behat/Context/Ui/Shop/Checkout/RegistrationAfterCheckoutContext.php index dbe3a6efd33e..0659d5eb2225 100644 --- a/src/Sylius/Behat/Context/Ui/Shop/Checkout/RegistrationAfterCheckoutContext.php +++ b/src/Sylius/Behat/Context/Ui/Shop/Checkout/RegistrationAfterCheckoutContext.php @@ -101,7 +101,7 @@ public function iShouldBeAbleToLogInAsWithPassword(string $email, string $passwo } /** - * @Then /^I should be on registration thank you page$/ + * @Then I should be on registration thank you page */ public function iShouldBeOnRegistrationThankYouPage(): void { diff --git a/src/Sylius/Behat/Page/Shop/Account/RegisterThankYouPageInterface.php b/src/Sylius/Behat/Page/Shop/Account/RegisterThankYouPageInterface.php index f3a4d374bff7..55afe46b4aa4 100644 --- a/src/Sylius/Behat/Page/Shop/Account/RegisterThankYouPageInterface.php +++ b/src/Sylius/Behat/Page/Shop/Account/RegisterThankYouPageInterface.php @@ -6,5 +6,4 @@ interface RegisterThankYouPageInterface extends SymfonyPageInterface { - }