Merge branch 'MAGETWO-90325' into 2.2-develop-mftf-pr3

Author: Stas Puga

app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutAddNewAdressInShippingSectionActionGroup.xml renamed to app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutAddNewAddressInShippingSectionActionGroup.xml

@@ -20,7 +20,7 @@
         <fillField selector="{{CheckoutShippingSection.addPostcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
         <fillField selector="{{CheckoutShippingSection.addTelephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
         <click selector="{{CheckoutShippingSection.addSaveButton}}" stepKey="clickSaveAdressAdd"/>
-        <see stepKey="seeRegionSelected" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerAddressVar.state}}"/>
         <waitForPageLoad stepKey="waitPageLoad"/>
+        <see stepKey="seeRegionSelected" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerAddressVar.state}}"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Checkout/Test/Mftf/ActionGroup/CustomerCheckoutFillNewBillingAddressActionGroup.xml renamed to app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutFillNewBillingAddressActionGroup.xml

@@ -9,7 +9,7 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!--  Logged in user checkout add new address Payment section -->
-    <actionGroup name="CustomerCheckoutFillNewBillingAddressActionGroup">
+    <actionGroup name="LoggedInUserCheckoutFillNewBillingAddressActionGroup">
         <arguments>
             <argument name="customerVar"/>
             <argument name="customerAddressVar"/>

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

@@ -24,12 +24,12 @@
         <element name="newAddressButton" type="button" selector="#checkout-step-shipping button"/>
         <element name="next" type="button" selector="[data-role='opc-continue']"/>
         <element name="newAdress" type="button" selector="button.action.action-show-popup"/>
-        <element name="newAddressStreet" type="input" selector="#shipping-new-address-form input[name='street[0]']"/>
-        <element name="newAddressCity" type="input" selector="#shipping-new-address-form input[name='city']"/>
-        <element name="newAddressState" type="select" selector="#shipping-new-address-form select[name='region_id']"/>
-        <element name="newAddressPostcode" type="input" selector="#shipping-new-address-form input[name='postcode']"/>
-        <element name="newTelephone" type="input" selector="#shipping-new-address-form input[name='telephone']"/>
-        <element name="newAddressCountry" type="select" selector="#shipping-new-address-form select[name='country_id']"/>
-        <element name="saveButton" type="button" selector=".action.primary.action-save-address"/>
+        <element name="addStreet" type="input" selector="#shipping-new-address-form input[name='street[0]']"/>
+        <element name="addCity" type="input" selector="#shipping-new-address-form input[name='city']"/>
+        <element name="addState" type="select" selector="#shipping-new-address-form select[name='region_id']"/>
+        <element name="addPostcode" type="input" selector="#shipping-new-address-form input[name='postcode']"/>
+        <element name="addTelephone" type="input" selector="#shipping-new-address-form input[name='telephone']"/>
+        <element name="addcCountry" type="select" selector="#shipping-new-address-form select[name='country_id']"/>
+        <element name="addSaveButton" type="button" selector=".action.primary.action-save-address"/>
     </section>
 </sections>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithTaxForVirtulQuoteTest.xml

@@ -60,7 +60,7 @@
         <click selector="{{CheckoutPaymentSection.editAddressButton}}"  stepKey="clickEditButton"/>
         <selectOption selector="{{CheckoutPaymentSection.newAddressSelect}}" userInput="New Address" stepKey="selectNewAddress"/>
         <!--  Step 6: Fill form with valid data and set: California -->
-        <actionGroup ref="CustomerCheckoutFillNewBillingAddressActionGroup" stepKey="guestCheckoutFillingShippingAddress">
+        <actionGroup ref="LoggedInUserCheckoutFillNewBillingAddressActionGroup" stepKey="guestCheckoutFillingShippingAddress">
             <argument name="customerVar" value="CustomerEntityOne" />
             <argument name="customerAddressVar" value="US_Address_CA" />
         </actionGroup>