Merge remote-tracking branch 'origin/2.3.2-develop' into MC-17016

Author: SeruyV

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="#checkout-customer-email"/>
+        <element name="email" type="input" selector="#customer-email"/>
         <element name="firstName" type="input" selector="input[name=firstname]"/>
         <element name="lastName" type="input" selector="input[name=lastname]"/>
         <element name="street" type="input" selector="input[name='street[0]']"/>

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="#checkout-customer-email"/>
+        <element name="email" type="input" selector="#customer-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]"/>

app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutCheckoutCustomerLoginSection.xml

@@ -11,7 +11,7 @@
     <section name="StorefrontCheckoutCheckoutCustomerLoginSection">
         <element name="email" type="input" selector="form[data-role='email-with-possible-login'] input[name='username']" />
         <element name="emailNoteMessage" type="text" selector="//form[@data-role='email-with-possible-login']//div[input[@name='username']]//*[contains(@class, 'note')]" />
-        <element name="emailErrorMessage" type="text" selector="//form[@data-role='email-with-possible-login']//div[input[@name='username']]//*[@id='checkout-customer-email-error']" />
+        <element name="emailErrorMessage" type="text" selector="//form[@data-role='email-with-possible-login']//div[input[@name='username']]//*[@id='customer-email-error']" />
         <element name="emailTooltipButton" type="button" selector="//form[@data-role='email-with-possible-login']//div[input[@name='username']]//*[contains(@class, 'action-help')]" />
         <element name="emailTooltipContent" type="text" selector="//form[@data-role='email-with-possible-login']//div[input[@name='username']]//*[contains(@class, 'field-tooltip-content')]" />
         <element name="password" type="input" selector="form[data-role='email-with-possible-login'] input[name='password']" />

app/code/Magento/Checkout/view/frontend/web/template/authentication.html

@@ -31,15 +31,15 @@
         <div class="block block-customer-login"
              data-bind="attr: {'data-label': $t('or')}">
             <div class="block-title">
-                <strong id="block-customer-login-heading-checkout"
+                <strong id="block-customer-login-heading"
                     role="heading"
                     aria-level="2"
                     data-bind="i18n: 'Sign In'"></strong>
             </div>
             <!-- ko foreach: getRegion('messages') -->
             <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->
-            <div class="block-content" aria-labelledby="block-customer-login-heading-checkout">
+            <div class="block-content" aria-labelledby="block-customer-login-heading">
                 <form data-role="login"
                       data-bind="submit:login"
                       method="post">

app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html

@@ -14,7 +14,7 @@
       method="post">
     <fieldset id="customer-email-fieldset" class="fieldset" data-bind="blockLoader: isLoading">
         <div class="field required">
-            <label class="label" for="checkout-customer-email">
+            <label class="label" for="customer-email">
                 <span data-bind="i18n: 'Email Address'"></span>
             </label>
             <div class="control _with-tooltip">
@@ -26,7 +26,7 @@
                             mageInit: {'mage/trim-input':{}}"
                        name="username"
                        data-validate="{required:true, 'validate-email':true}"
-                       id="checkout-customer-email" />
+                       id="customer-email" />
                 <!-- ko template: 'ui/form/element/helper/tooltip' --><!-- /ko -->
                 <span class="note" data-bind="fadeVisible: isPasswordVisible() == false"><!-- ko i18n: 'You can create an account after checkout.'--><!-- /ko --></span>
             </div>

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php

@@ -102,7 +102,7 @@ class Shipping extends Form
      *
      * @var string
      */
-    private $emailError = '#checkout-customer-email-error';
+    private $emailError = '#ustomer-email-error';
 
     /**
      * Get email error.

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.xml

@@ -8,7 +8,7 @@
 <mapping strict="0">
     <fields>
         <email>
-            <selector>#checkout-customer-email</selector>
+            <selector>#customer-email</selector>
         </email>
         <firstname />
         <lastname />