Merge remote-tracking branch 'remotes/github/MC-15507' into EPAM-PR-76

Author: VeronikaYarats

app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml

@@ -28,6 +28,10 @@
         <fillField selector="{{CheckoutPaymentSection.guestPostcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
         <fillField selector="{{CheckoutPaymentSection.guestTelephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
     </actionGroup>
+    <actionGroup name="StorefrontCheckoutFillNewBillingAddressActionGroup" extends="GuestCheckoutFillNewBillingAddressActionGroup">
+        <remove keyForRemoval="enterEmail"/>
+        <remove keyForRemoval="waitForLoading3"/>
+    </actionGroup>
 
     <actionGroup name="LoggedInCheckoutFillNewBillingAddressActionGroup">
         <annotations>

app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml

@@ -14,5 +14,6 @@
         <section name="CheckoutOrderSummarySection"/>
         <section name="CheckoutSuccessMainSection"/>
         <section name="CheckoutPaymentSection"/>
+        <section name="SelectShippingBillingPopupSection"/>
     </page>
 </pages>

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

@@ -42,6 +42,7 @@
         <element name="ProductOptionLinkActiveByProductItemName" type="text" selector="//div[@class='product-item-details']//strong[@class='product-item-name'][text()='{{var1}}']//ancestor::div[@class='product-item-details']//div[@class='product options active']//a[text() = '{{var2}}']" parameterized="true" />
         <element name="shipToInformation" type="text" selector="//div[@class='ship-to']//div[@class='shipping-information-content']" />
         <element name="shippingMethodInformation" type="text" selector="//div[@class='ship-via']//div[@class='shipping-information-content']" />
+        <element name="shippingInformationSection" type="text" selector=".ship-to .shipping-information-content" />
         <element name="paymentMethodTitle" type="text" selector=".payment-method-title span" />
         <element name="productOptionsByProductItemPrice" type="text" selector="//div[@class='product-item-inner']//div[@class='subtotal']//span[@class='price'][contains(.,'{{price}}')]//ancestor::div[@class='product-item-details']//div[@class='product options']" parameterized="true"/>
         <element name="productOptionsActiveByProductItemPrice" type="text" selector="//div[@class='subtotal']//span[@class='price'][contains(.,'{{price}}')]//ancestor::div[@class='product-item-details']//div[@class='product options active']" parameterized="true"/>

app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

@@ -249,6 +249,16 @@ define([
             if (this.validateShippingInformation()) {
                 quote.billingAddress(null);
                 checkoutDataResolver.resolveBillingAddress();
+                registry.async('checkoutProvider')(function (checkoutProvider) {
+                    var shippingAddressData = checkoutData.getShippingAddressFromData();
+
+                    if (shippingAddressData) {
+                        checkoutProvider.set(
+                            'shippingAddress',
+                            $.extend(true, {}, checkoutProvider.get('shippingAddress'), shippingAddressData)
+                        );
+                    }
+                });
                 setShippingInformationAction().done(
                     function () {
                         stepNavigator.next();

app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml

@@ -51,6 +51,21 @@
         <data key="default_shipping">Yes</data>
         <requiredEntity type="region">RegionTX</requiredEntity>
     </entity>
+    <entity name="US_Address_TX_Without_Default" type="address">
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="company">Magento</data>
+        <array key="street">
+            <item>7700 West Parmer Lane</item>
+        </array>
+        <data key="city">Austin</data>
+        <data key="state">Texas</data>
+        <data key="country_id">US</data>
+        <data key="country">United States</data>
+        <data key="postcode">78729</data>
+        <data key="telephone">512-345-6789</data>
+        <requiredEntity type="region">RegionTX</requiredEntity>
+    </entity>
     <entity name="US_Address_TX_Default_Billing" type="address">
         <data key="firstname">John</data>
         <data key="lastname">Doe</data>

app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml

@@ -47,6 +47,20 @@
         <data key="group">General</data>
         <requiredEntity type="address">US_Address_TX</requiredEntity>
     </entity>
+    <entity name="Simple_US_Customer_Without_Default_Address" type="customer">
+        <data key="group_id">1</data>
+        <data key="default_billing">true</data>
+        <data key="default_shipping">true</data>
+        <data key="email" unique="prefix">John.Doe@example.com</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="fullname">John Doe</data>
+        <data key="password">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+        <data key="group">General</data>
+        <requiredEntity type="address">US_Address_TX_Without_Default</requiredEntity>
+    </entity>
     <entity name="SimpleUsCustomerWithNewCustomerGroup" type="customer">
         <data key="default_billing">true</data>
         <data key="default_shipping">true</data>