From e1a1bef8df131e99c2067edd993d4da6f09e405d Mon Sep 17 00:00:00 2001
From: Veljko V <veljano@yahoo.com>
Date: Thu, 27 Aug 2020 12:02:06 +0200
Subject: [PATCH] Update existing scenario to be more concise

[MAILPOET-3119]
---
 .../EditSignUpConfirmationEmailCest.php       | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/tests/acceptance/EditSignUpConfirmationEmailCest.php b/tests/acceptance/EditSignUpConfirmationEmailCest.php
index e127ed3ac6..437aa36342 100644
--- a/tests/acceptance/EditSignUpConfirmationEmailCest.php
+++ b/tests/acceptance/EditSignUpConfirmationEmailCest.php
@@ -7,34 +7,44 @@ use MailPoet\Test\DataFactories\Form;
 use MailPoet\Test\DataFactories\Settings;
 
 class EditSignUpConfirmationEmailCest {
-  public function edit(\AcceptanceTester $i) {
+  public function editSignUpConfContentAndVerify(\AcceptanceTester $i) {
     $i->wantTo('Edit sign up confirmation email');
-
     // make sure sign up confirmation is enabled
     $settings = new Settings();
     $settings->withSender('Confirmation Test From', 'from-confirmation-test@example.com');
     $settings->withConfirmationEmailEnabled();
     $forms = new Form();
     $forms->withDefaultSuccessMessage();
+    $confirmationEmailSubject = 'Confirmation email subject';
 
     $i->login();
     $i->amOnMailPoetPage('Settings');
     $i->click('[data-automation-id="signup_settings_tab"]');
     $i->waitForText('Enable sign-up confirmation');
-
     // edit confirmation email
-    $i->fillField('[data-automation-id="signup_confirmation_email_subject"]', 'Confirmation email subject');
+    $i->fillField('[data-automation-id="signup_confirmation_email_subject"]', $confirmationEmailSubject);
     $i->fillField('[data-automation-id="signup_confirmation_email_body"]', 'Confirmation email body [activation_link]link[/activation_link]');
-
     $i->click('[data-automation-id="settings-submit-button"]');
-
+    // create form and subscribe
     $i->createFormAndSubscribe();
-
+    // performing some clicks and getting back to verify the content
+    $i->amOnMailpoetPage('Settings');
+    $i->click('[data-automation-id="activation_settings_tab"]');
+    $i->click('Verify');
+    $i->amOnMailpoetPage('Emails');
+    $i->waitForText('Emails');
+    $i->amOnMailpoetPage('Settings');
+    $i->waitForText('Settings');
+    $i->click('[data-automation-id="settings-submit-button"]');
+    $i->waitForText('Settings saved');
+    $i->click('[data-automation-id="signup_settings_tab"]');
+    $i->waitForText('Enable sign-up confirmation');
+    $i->seeInField('[data-automation-id="signup_confirmation_email_subject"]', $confirmationEmailSubject);
+    $i->seeInField('[data-automation-id="signup_confirmation_email_body"]', 'Confirmation email body [activation_link]link[/activation_link]');
     // check the received email
-    $i->checkEmailWasReceived('Confirmation email subject');
-    $i->click(Locator::contains('span.subject', 'Confirmation email subject'));
-
-    $i->waitForText('Confirmation email subject');
+    $i->checkEmailWasReceived($confirmationEmailSubject);
+    $i->click(Locator::contains('span.subject', $confirmationEmailSubject));
+    $i->waitForText($confirmationEmailSubject);
     $i->waitForText('Confirmation Test From <from-confirmation-test@example.com>');
     $i->switchToIframe('#preview-html');
     $i->waitForText('Confirmation email body link');