From a5a9c4c1829db844ab70e2143b31140b6df52ec8 Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Sun, 25 Oct 2020 10:18:25 +0100
Subject: [PATCH 01/11] Initialize authentication popup modal only when needed

---
 .../frontend/web/js/view/authentication-popup.js   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/code/Magento/Customer/view/frontend/web/js/view/authentication-popup.js b/app/code/Magento/Customer/view/frontend/web/js/view/authentication-popup.js
index c14a59af49706..e97e69301b7db 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/view/authentication-popup.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/view/authentication-popup.js
@@ -43,6 +43,20 @@ define([
 
         /** Init popup login window */
         setModalElement: function (element) {
+            var cart = customerData.get('cart');
+
+            if (cart().isGuestCheckoutAllowed === false) {
+                this.createPopup(element);
+            } else {
+                cart.subscribe(function(cartData) {
+                    if (cartData.isGuestCheckoutAllowed === false) {
+                        this.createPopup(element);
+                    }
+                }, this);
+            }
+        },
+
+        createPopup: function(element) {
             if (authenticationPopup.modalWindow == null) {
                 authenticationPopup.createPopUp(element);
             }

From cad2c2525aa5d5033fd738bb9425959cf69578d0 Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Wed, 28 Oct 2020 14:35:15 +0100
Subject: [PATCH 02/11] Fix static and functional tests

---
 .../web/js/view/authentication-popup.js       | 11 +++--
 .../js/view/authentication-popup.test.js      | 46 +++++++++++++++++--
 2 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/web/js/view/authentication-popup.js b/app/code/Magento/Customer/view/frontend/web/js/view/authentication-popup.js
index e97e69301b7db..b77104f8f280e 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/view/authentication-popup.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/view/authentication-popup.js
@@ -41,14 +41,16 @@ define([
             });
         },
 
-        /** Init popup login window */
+        /**
+         * Sets modal on given HTML element with on demand initialization.
+         */
         setModalElement: function (element) {
             var cart = customerData.get('cart');
 
             if (cart().isGuestCheckoutAllowed === false) {
                 this.createPopup(element);
             } else {
-                cart.subscribe(function(cartData) {
+                cart.subscribe(function (cartData) {
                     if (cartData.isGuestCheckoutAllowed === false) {
                         this.createPopup(element);
                     }
@@ -56,7 +58,10 @@ define([
             }
         },
 
-        createPopup: function(element) {
+        /**
+         * Initializes authentication modal on given HTML element.
+         */
+        createPopup: function (element) {
             if (authenticationPopup.modalWindow == null) {
                 authenticationPopup.createPopUp(element);
             }
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/view/authentication-popup.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/view/authentication-popup.test.js
index 8a8216a820dd4..a2497d82bbc0f 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/view/authentication-popup.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/view/authentication-popup.test.js
@@ -4,7 +4,7 @@
  */
 
 /* eslint max-nested-callbacks: 0 */
-define(['squire'], function (Squire) {
+define(['squire', 'ko'], function (Squire, ko) {
     'use strict';
 
     var injector = new Squire(),
@@ -64,9 +64,47 @@ define(['squire'], function (Squire) {
 
     describe('Magento_Customer/js/view/authentication-popup', function () {
         describe('"setModalElement" method', function () {
-            it('Check for return value.', function () {
-                expect(obj.setModalElement()).toBeUndefined();
-                expect(mocks['Magento_Customer/js/model/authentication-popup'].createPopUp).toHaveBeenCalled();
+            it('skips modal initialization when cart is not initialized', function () {
+                mocks['Magento_Customer/js/customer-data'].get.and.returnValue(
+                    ko.observable({})
+                );
+
+                obj.setModalElement();
+
+                expect(
+                    mocks['Magento_Customer/js/model/authentication-popup']
+                        .createPopUp
+                ).not.toHaveBeenCalled();
+            });
+
+            it('skips modal initialization when guest checkout is allowed', function () {
+                mocks['Magento_Customer/js/customer-data'].get.and.returnValue(
+                    ko.observable({
+                        isGuestCheckoutAllowed: true
+                    })
+                );
+
+                obj.setModalElement();
+
+                expect(
+                    mocks['Magento_Customer/js/model/authentication-popup']
+                        .createPopUp
+                ).not.toHaveBeenCalled();
+            });
+
+            it('initializes modal when guest checkout is disabled', function () {
+                mocks['Magento_Customer/js/customer-data'].get.and.returnValue(
+                    ko.observable({
+                        isGuestCheckoutAllowed: false
+                    })
+                );
+
+                obj.setModalElement();
+
+                expect(
+                    mocks['Magento_Customer/js/model/authentication-popup']
+                        .createPopUp
+                ).toHaveBeenCalled();
             });
         });
     });

From 9901e8544402827ce32d985c7a35f487f1461935 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Tue, 24 Nov 2020 15:43:27 +0200
Subject: [PATCH 03/11] fix all selectors

---
 .../Mftf/Section/StorefrontCustomerSignInFormSection.xml    | 6 +++---
 .../Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml  | 2 +-
 .../Checkout/Test/Mftf/Section/CheckoutShippingSection.xml  | 4 ++--
 .../Test/Mftf/Section/CheckoutSuccessMainSection.xml        | 2 +-
 .../Test/Mftf/Section/CheckoutSuccessRegisterSection.xml    | 2 +-
 .../StorefrontCustomerSignInFormSection.xml                 | 6 +++---
 .../StorefrontCustomerSignInPopupFormSection.xml            | 2 +-
 .../Test/Mftf/Section/StorefrontNewsletterManageSection.xml | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
index 54aa36d1ca267..1aabfb8a0c428 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
@@ -9,8 +9,8 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerSignInFormSection">
-        <element name="captchaField" type="input" selector="#captcha_user_login"/>
-        <element name="captchaImg" type="block" selector=".captcha-img"/>
-        <element name="captchaReload" type="block" selector=".captcha-reload"/>
+        <element name="captchaField" type="input" selector="fieldset #captcha_user_login"/>
+        <element name="captchaImg" type="block" selector="fieldset .captcha-img"/>
+        <element name="captchaReload" type="block" selector="fieldset .captcha-reload"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml
index c39fab8a52e8e..9c30ff2c4d610 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml
@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CheckoutShippingGuestInfoSection">
-        <element name="email" type="input" selector="#customer-email"/>
+        <element name="email" type="input" selector="fieldset input[type='email']"/>
         <element name="firstName" type="input" selector="input[name=firstname]"/>
         <element name="lastName" type="input" selector="input[name=lastname]"/>
         <element name="company" type="input" selector="input[name=company]"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
index 59d46e8cca696..4e7e6100b0a7a 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
@@ -15,7 +15,7 @@
         <element name="editAddressButton" type="button" selector=".action-edit-address" timeout="30"/>
         <element name="addressDropdown" type="select" selector="[name=billing_address_id]"/>
         <element name="newAddressButton" type="button" selector=".action-show-popup" timeout="30"/>
-        <element name="email" type="input" selector="input[id*=customer-email]"/>
+        <element name="email" type="input" selector="fieldset input[id*=customer-email]"/>
         <element name="password" type="input" selector="#customer-password"/>
         <element name="firstName" type="input" selector="input[name=firstname]"/>
         <element name="lastName" type="input" selector="input[name=lastname]"/>
@@ -39,7 +39,7 @@
         <element name="editActiveAddress" type="button" selector="//div[@class='shipping-address-item selected-item']//span[text()='Edit']" timeout="30"/>
         <element name="loginButton" type="button" selector="//button[@data-action='checkout-method-login']" timeout="30"/>
         <element name="editActiveAddressButton" type="button" selector="//div[contains(@class,'payment-method _active')]//button[contains(@class,'action action-edit-address')]" timeout="30"/>
-        <element name="emailAddress" type="input" selector="#customer-email"/>
+        <element name="emailAddress" type="input" selector="fieldset input[type='email']"/>
         <element name="shipHereButton" type="button" selector="//div[text()='{{street}}']/button[@class='action action-select-shipping-item']" parameterized="true" timeout="30"/>
         <element name="addressFieldValidationError" type="text" selector="div.address div.field .field-error"/>
         <element name="textFieldAttrRequireMessage" type="text" selector="//input[@name='custom_attributes[{{attribute}}]']/ancestor::div[contains(@class, 'control')]/div/span" parameterized="true" timeout="30"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
index d15b89e58a550..abdb4ddac7343 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
@@ -17,7 +17,7 @@
         <element name="orderLinks" type="text" selector="a[href*=order_id]" timeout="30"/>
         <element name="orderNumberText" type="text" selector=".checkout-success > p:nth-child(1)"/>
         <element name="continueShoppingButton" type="button" selector=".action.primary.continue" timeout="30"/>
-        <element name="createAnAccount" type="button" selector="[data-bind*=&quot;i18n: 'Create an Account'&quot;]" timeout="30"/>
+        <element name="createAnAccount" type="button" selector="a[class='action primary'] [data-bind*=&quot;i18n: 'Create an Account'&quot;]" timeout="30"/>
         <element name="printLink" type="button" selector=".print" timeout="30"/>
         <element name="orderNumberWithoutLink" type="text" selector="//div[contains(@class, 'checkout-success')]//p/span"/>
         <element name="orderLinkByOrderNumber" type="text" selector="//div[contains(@class,'success')]//a[contains(.,'{{orderNumber}}')]" parameterized="true" timeout="30"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml
index baee6cc7177c8..e029bf9ceb9be 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml
@@ -11,7 +11,7 @@
     <section name="CheckoutSuccessRegisterSection">
         <element name="registerMessage" type="text" selector="#registration p:nth-child(1)"/>
         <element name="customerEmail" type="text" selector="#registration p:nth-child(2)"/>
-        <element name="createAccountButton" type="button" selector="[data-bind*=&quot;i18n: 'Create an Account'&quot;]" timeout="30"/>
+        <element name="createAccountButton" type="button" selector="a[class='action primary'] [data-bind*=&quot;i18n: 'Create an Account'&quot;]" timeout="30"/>
         <element name="orderNumber" type="text" selector="//p[text()='Your order # is: ']//span"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInFormSection.xml
index 2e40610c18f82..5405c8fd0731a 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInFormSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInFormSection.xml
@@ -8,9 +8,9 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerSignInFormSection">
-        <element name="emailField" type="input" selector="#email"/>
-        <element name="passwordField" type="input" selector="#pass"/>
-        <element name="signInAccountButton" type="button" selector="#send2" timeout="30"/>
+        <element name="emailField" type="input" selector="fieldset.login #email"/>
+        <element name="passwordField" type="input" selector="fieldset.login #pass"/>
+        <element name="signInAccountButton" type="button" selector="fieldset.login #send2" timeout="30"/>
         <element name="forgotPasswordLink" type="button" selector=".action.remind" timeout="10"/>
         <element name="customerLoginBlock" type="text" selector=".login-container .block.block-customer-login"/>
     </section>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInPopupFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInPopupFormSection.xml
index c33736a54f442..246a8ecf7e8d9 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInPopupFormSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInPopupFormSection.xml
@@ -9,7 +9,7 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerSignInPopupFormSection">
         <element name="errorMessage" type="input" selector="[data-ui-id='checkout-cart-validationmessages-message-error']"/>
-        <element name="email" type="input" selector="#customer-email"/>
+        <element name="email" type="input" selector="fieldset input[type='email']"/>
         <element name="password" type="input" selector="#pass"/>
         <element name="signIn" type="button" selector="#send2" timeout="30"/>
         <element name="createAnAccount" type="button" selector="//div[contains(@class,'actions-toolbar')]//a[contains(.,'Create an Account')]" timeout="30"/>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterManageSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterManageSection.xml
index 9248970d9e623..77da0cd36395f 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterManageSection.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterManageSection.xml
@@ -10,6 +10,6 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontNewsletterManageSection">
         <element name="subscriptionCheckbox" type="checkbox" selector="#subscription" />
-        <element name="saveButton" type="button" selector="div.primary>button"/>
+        <element name="saveButton" type="button" selector="div.primary>button.save"/>
     </section>
 </sections>

From bd78d3c585b74d2d62afec8f94637d168952ab25 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Wed, 25 Nov 2020 11:16:08 +0200
Subject: [PATCH 04/11] fix selector

---
 .../StorefrontCustomerSignInPopupFormSection.xml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInPopupFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInPopupFormSection.xml
index 246a8ecf7e8d9..c33736a54f442 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInPopupFormSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInPopupFormSection.xml
@@ -9,7 +9,7 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerSignInPopupFormSection">
         <element name="errorMessage" type="input" selector="[data-ui-id='checkout-cart-validationmessages-message-error']"/>
-        <element name="email" type="input" selector="fieldset input[type='email']"/>
+        <element name="email" type="input" selector="#customer-email"/>
         <element name="password" type="input" selector="#pass"/>
         <element name="signIn" type="button" selector="#send2" timeout="30"/>
         <element name="createAnAccount" type="button" selector="//div[contains(@class,'actions-toolbar')]//a[contains(.,'Create an Account')]" timeout="30"/>

From c559a2e2ca5ff39d2e8997174c9791440533dde1 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Fri, 8 Jan 2021 15:21:56 +0200
Subject: [PATCH 05/11] fixed a bunch of selectors

---
 .../GuestCheckoutFillNewBillingAddressActionGroup.xml         | 2 +-
 .../GuestCheckoutFillNewShippingAddressActionGroup.xml        | 2 +-
 .../GuestCheckoutFillingShippingSectionActionGroup.xml        | 2 +-
 .../ActionGroup/LoginAsCustomerOnCheckoutPageActionGroup.xml  | 4 ++--
 .../Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml   | 4 ++--
 .../StorefrontProcessCheckoutToPaymentActionGroup.xml         | 2 +-
 .../StorefrontTaxQuoteCheckoutGuestSimpleTest.xml             | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
index 22f9f100ed08f..5c0eb439dbb3c 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
@@ -18,7 +18,7 @@
             <argument name="customerAddressVar"/>
         </arguments>
 
-        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{customerVar.email}}" stepKey="enterEmail"/>
+        <fillField selector="{{CheckoutShippingSection.emailAddress}}" userInput="{{customerVar.email}}" stepKey="enterEmail"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading3"/>
         <fillField selector="{{CheckoutPaymentSection.guestFirstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>
         <fillField selector="{{CheckoutPaymentSection.guestLastName}}" userInput="{{customerVar.lastname}}" stepKey="enterLastName"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewShippingAddressActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewShippingAddressActionGroup.xml
index aa48a7c2537bd..c9f315929dcfa 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewShippingAddressActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewShippingAddressActionGroup.xml
@@ -17,7 +17,7 @@
             <argument name="address" type="entity"/>
         </arguments>
 
-        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{customer.email}}" stepKey="fillEmailField"/>
+        <fillField selector="{{CheckoutShippingSection.emailAddress}}" userInput="{{customer.email}}" stepKey="fillEmailField"/>
         <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customer.firstName}}" stepKey="fillFirstName"/>
         <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customer.lastName}}" stepKey="fillLastName"/>
         <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{address.street}}" stepKey="fillStreet"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillingShippingSectionActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillingShippingSectionActionGroup.xml
index f020cb42725c8..831b141bb98eb 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillingShippingSectionActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillingShippingSectionActionGroup.xml
@@ -19,7 +19,7 @@
             <argument name="shippingMethod" defaultValue="" type="string"/>
         </arguments>
 
-        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{customerVar.email}}" stepKey="enterEmail"/>
+        <fillField selector="{{CheckoutShippingSection.emailAddress}}" userInput="{{customerVar.email}}" stepKey="enterEmail"/>
         <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>
         <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customerVar.lastname}}" stepKey="enterLastName"/>
         <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{customerAddressVar.street[0]}}" stepKey="enterStreet"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoginAsCustomerOnCheckoutPageActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoginAsCustomerOnCheckoutPageActionGroup.xml
index bc39e957b26fc..02cb9ebc72352 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoginAsCustomerOnCheckoutPageActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoginAsCustomerOnCheckoutPageActionGroup.xml
@@ -15,9 +15,9 @@
         <arguments>
             <argument name="customer" type="entity"/>
         </arguments>
-        
+
         <waitForPageLoad stepKey="waitForCheckoutShippingSectionToLoad"/>
-        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{customer.email}}" stepKey="fillEmailField"/>
+        <fillField selector="{{CheckoutShippingSection.emailAddress}}" userInput="{{customer.email}}" stepKey="fillEmailField"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
         <waitForElementVisible selector="{{CheckoutShippingSection.password}}" stepKey="waitForElementVisible"/>
         <fillField selector="{{CheckoutShippingSection.password}}" userInput="{{customer.password}}" stepKey="fillPasswordField"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml
index 1faecfb3bbb7e..5cab58f568cd0 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml
@@ -13,8 +13,8 @@
         <annotations>
             <description>Fills in the Customer details for the 'Shipping Address' section of the Storefront Checkout page. Selects 'Free Shipping'. Clicks on Next. Validates that the URL is present and correct.</description>
         </annotations>
-        
-        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="setCustomerEmail"/>
+
+        <fillField selector="{{CheckoutShippingSection.emailAddress}}" userInput="{{CustomerEntityOne.email}}" stepKey="setCustomerEmail"/>
         <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="SetCustomerFirstName"/>
         <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="SetCustomerLastName"/>
         <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{CustomerAddressSimple.street}}" stepKey="SetCustomerStreetAddress"/>
diff --git a/app/code/Magento/CheckoutAgreements/Test/Mftf/ActionGroup/StorefrontProcessCheckoutToPaymentActionGroup.xml b/app/code/Magento/CheckoutAgreements/Test/Mftf/ActionGroup/StorefrontProcessCheckoutToPaymentActionGroup.xml
index c40f24836c815..bc0c48142e223 100644
--- a/app/code/Magento/CheckoutAgreements/Test/Mftf/ActionGroup/StorefrontProcessCheckoutToPaymentActionGroup.xml
+++ b/app/code/Magento/CheckoutAgreements/Test/Mftf/ActionGroup/StorefrontProcessCheckoutToPaymentActionGroup.xml
@@ -16,7 +16,7 @@
         <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
 
         <!--Process steps-->
-        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
+        <fillField selector="{{CheckoutShippingSection.emailAddress}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
         <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
         <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>
         <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="enterStreet"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml
index d2f1b1aa44393..b178e8b689907 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml
@@ -80,7 +80,7 @@
 
         <!-- Fill in address for CA -->
         <actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="goToCheckout"/>
-        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{Simple_US_Customer_CA.email}}" stepKey="enterEmail"/>
+        <fillField selector="{{CheckoutShippingSection.emailAddress}}" userInput="{{Simple_US_Customer_CA.email}}" stepKey="enterEmail"/>
         <waitForLoadingMaskToDisappear stepKey="waitEmailLoad"/>
         <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
             <argument name="Address" value="US_Address_CA"/>

From 3ef8b095894ba1642ab5816bbc3ccc3f5e76a17c Mon Sep 17 00:00:00 2001
From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com>
Date: Fri, 8 Jan 2021 17:05:21 +0200
Subject: [PATCH 06/11] fix email selector

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

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillingShippingSectionUnavailablePaymentActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillingShippingSectionUnavailablePaymentActionGroup.xml
index 9ce14338f1223..9d7c72522d003 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillingShippingSectionUnavailablePaymentActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillingShippingSectionUnavailablePaymentActionGroup.xml
@@ -17,7 +17,7 @@
             <argument name="customerAddressVar"/>
         </arguments>
 
-        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{customerVar.email}}" stepKey="enterEmail"/>
+        <fillField selector="{{CheckoutShippingSection.emailAddress}}" userInput="{{customerVar.email}}" stepKey="enterEmail"/>
         <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>
         <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customerVar.lastname}}" stepKey="enterLastName"/>
         <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{customerAddressVar.street[0]}}" stepKey="enterStreet"/>

From 20d7b75783efa7c9a12aa6a9c99e19ca89376d3c Mon Sep 17 00:00:00 2001
From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com>
Date: Mon, 11 Jan 2021 13:05:37 +0200
Subject: [PATCH 07/11] fix email selector

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

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillingShippingSectionWithoutRegionActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillingShippingSectionWithoutRegionActionGroup.xml
index 3db019c44dd0d..ada3674a07b8d 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillingShippingSectionWithoutRegionActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillingShippingSectionWithoutRegionActionGroup.xml
@@ -17,7 +17,7 @@
             <argument name="customerAddressVar"/>
         </arguments>
 
-        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{customerVar.email}}" stepKey="enterEmail"/>
+        <fillField selector="{{CheckoutShippingSection.emailAddress}}" userInput="{{customerVar.email}}" stepKey="enterEmail"/>
         <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>
         <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customerVar.lastname}}" stepKey="enterLastName"/>
         <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{customerAddressVar.street[0]}}" stepKey="enterStreet"/>

From c3f47b3cd2e4a97ea30083c1322075861ff626df Mon Sep 17 00:00:00 2001
From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com>
Date: Mon, 11 Jan 2021 13:08:00 +0200
Subject: [PATCH 08/11] fixed email selector for test

---
 .../Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
index 321511e4e86d9..54ad407d9fa3e 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
@@ -36,7 +36,7 @@
             <argument name="productName" value="$createProduct.name$$"/>
         </actionGroup>
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
-        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
+        <fillField selector="{{CheckoutShippingSection.emailAddress}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
         <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
         <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>
         <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="enterStreet"/>

From 934cd11da84ff502a0fc0c07f7c1e6f7833b38aa Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Fri, 23 Apr 2021 16:07:30 +0300
Subject: [PATCH 09/11] magento/magento2#30672: Initialize authentication popup
 modal only when needed.

---
 .../Mftf/Page/StorefrontCustomerSignInPage.xml     |  1 +
 .../StorefrontCustomerLoginSignUpSection.xml       | 14 ++++++++++++++
 ...ckVatIdAtAccountCreateWithMultishipmentTest.xml |  4 ++--
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerLoginSignUpSection.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerSignInPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerSignInPage.xml
index b4814a3e4bedd..8f4f0a1596a8a 100644
--- a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerSignInPage.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerSignInPage.xml
@@ -11,5 +11,6 @@
     <page name="StorefrontCustomerSignInPage" url="/customer/account/login/" area="storefront" module="Magento_Customer">
         <section name="StorefrontCustomerSignInFormSection" />
         <section name="StorefrontCustomerLoginMessagesSection"/>
+        <section name="StorefrontCustomerLoginSignUpSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerLoginSignUpSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerLoginSignUpSection.xml
new file mode 100644
index 0000000000000..87316466c07c9
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerLoginSignUpSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCreateUserSection">
+        <element name="createAnAccountButton" type="button" selector="//div[contains(@class, 'block-new-customer')]//a/span[contains(.,'Create an Account')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontCheckVatIdAtAccountCreateWithMultishipmentTest.xml b/app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontCheckVatIdAtAccountCreateWithMultishipmentTest.xml
index 618c32b21ad03..e2bbcaee62cb5 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontCheckVatIdAtAccountCreateWithMultishipmentTest.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontCheckVatIdAtAccountCreateWithMultishipmentTest.xml
@@ -41,8 +41,8 @@
         <waitForElementVisible selector="{{MultishippingSection.shippingMultipleCheckout}}" stepKey="waitMultipleAddressShippingButton"/>
         <click selector="{{MultishippingSection.shippingMultipleCheckout}}" stepKey="clickToMultipleAddressShippingButton"/>
         <!--Create an account-->
-        <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.createAnAccount}}" stepKey="waitCreateAnAccountButton"/>
-        <click selector="{{StorefrontCustomerSignInPopupFormSection.createAnAccount}}" stepKey="clickOnCreateAnAccountButton"/>
+        <waitForElementVisible selector="{{AdminCreateUserSection.createAnAccountButton}}" stepKey="waitCreateAnAccountButton"/>
+        <click selector="{{AdminCreateUserSection.createAnAccountButton}}" stepKey="clickOnCreateAnAccountButton"/>
         <waitForPageLoad stepKey="waitForCreateAccountPageToLoad"/>
         <!--Check the VAT Number field-->
         <seeElement selector="{{StorefrontCustomerAddressSection.vatId}}" stepKey="assertVatIdField"/>

From 78f46948d08dc098dd06ff9b2855c00ed62baf3e Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Thu, 13 May 2021 17:04:15 +0300
Subject: [PATCH 10/11]  magento#30672: Initialize authentication popup modal
 only when needed - MFTF fix.

---
 ...ntGuestCheckoutShippingAddressFormPrefilledActionGroup.xml | 2 +-
 .../StorefrontCustomerSignInFormSection.xml                   | 4 ++--
 .../Test/Mftf/Test/StorefrontLoginFormShowPasswordTest.xml    | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontGuestCheckoutShippingAddressFormPrefilledActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontGuestCheckoutShippingAddressFormPrefilledActionGroup.xml
index 300e9c60ff362..427e4ac4546c5 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontGuestCheckoutShippingAddressFormPrefilledActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontGuestCheckoutShippingAddressFormPrefilledActionGroup.xml
@@ -17,7 +17,7 @@
             <argument name="address" defaultValue="US_Address_TX" type="entity"/>
         </arguments>
 
-        <grabValueFrom selector="{{CheckoutShippingSection.email}}" stepKey="email"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.emailAddress}}" stepKey="email"/>
         <grabValueFrom selector="{{CheckoutShippingSection.firstName}}" stepKey="firstname"/>
         <grabValueFrom selector="{{CheckoutShippingSection.lastName}}" stepKey="lastname"/>
         <grabValueFrom selector="{{CheckoutShippingSection.street}}" stepKey="street"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInFormSection.xml
index 3f2e70f530542..3f8acf6f17851 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInFormSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInFormSection.xml
@@ -8,8 +8,8 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerSignInFormSection">
-        <element name="emailField" type="input" selector="fieldset.login #email"/>
-        <element name="passwordField" type="input" selector="fieldset.login #pass"/>
+        <element name="emailField" type="input" selector="input[name='login[username]']"/>
+        <element name="passwordField" type="input" selector="input[name='login[password]']"/>
         <element name="showPasswordCheckbox" type="input" selector="#show-password"/>
         <element name="signInAccountButton" type="button" selector="fieldset.login #send2" timeout="30"/>
         <element name="forgotPasswordLink" type="button" selector=".action.remind" timeout="10"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLoginFormShowPasswordTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLoginFormShowPasswordTest.xml
index 4e967cdee8dfc..7465e4990ec45 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLoginFormShowPasswordTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLoginFormShowPasswordTest.xml
@@ -29,6 +29,8 @@
             <argument name="customer" value="$$customer$$"/>
         </actionGroup>
         <actionGroup ref="StorefrontLoginFormClickShowPasswordActionGroup" stepKey="clickShowPasswordCheckbox"/>
-        <actionGroup ref="AssertLoginFormPasswordFieldActionGroup" stepKey="AssertPasswordField"/>
+        <actionGroup ref="AssertLoginFormPasswordFieldActionGroup" stepKey="AssertPasswordField">
+            <argument name="passwordFieldType" value="password"/>
+        </actionGroup>
     </test>
 </tests>

From d5a525468eb0762ec7b4d4d0f23328ccc57c0ff8 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Fri, 14 May 2021 09:45:02 +0300
Subject: [PATCH 11/11]  magento#30672: Initialize authentication popup modal
 only when needed - MFTF fix.

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

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.xml
index caba8a9f0f49d..2ea50b5527bc8 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.xml
@@ -96,7 +96,7 @@
 
         <!--Proceed to checkout and check product name in Order Summary area-->
         <actionGroup ref="StorefrontClickProceedToCheckoutActionGroup" stepKey="proceedToCheckout"/>
-        <waitForElementVisible selector="{{CheckoutShippingSection.email}}" stepKey="waitForShippingPageLoad"/>
+        <waitForElementVisible selector="{{CheckoutShippingSection.emailAddress}}" stepKey="waitForShippingPageLoad"/>
         <conditionalClick selector="{{CheckoutShippingGuestInfoSection.itemInCart}}" dependentSelector="{{CheckoutShippingGuestInfoSection.itemInCartActive}}" visible="false" stepKey="clickItemInCart"/>
         <grabTextFrom selector="{{CheckoutShippingGuestInfoSection.productName}}" stepKey="grabProductNameShipping"/>
         <assertStringContainsString stepKey="assertProductNameShipping">