magento/partners-magento2b2b#534 Incorrect Shipping Address on Purchase Order Final Checkout Page

 - Cleaning up changes for StorefrontPlaceOrderFromPurchaseOrderUsingOnlinePaymentMethodTest

Author: dhaecker

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

@@ -16,14 +16,6 @@
             <argument name="address"/>
         </arguments>
 
-        <selectOption stepKey="selectRegion" selector="{{CheckoutShippingAddressModalSection.region}}" userInput="{{address.state}}" after="fillCityName"/>
-        <fillField stepKey="fillFirstName" selector="{{CheckoutShippingAddressModalSection.firstName}}" userInput="{{address.firstname}}"/>
-        <fillField stepKey="fillLastName" selector="{{CheckoutShippingAddressModalSection.lastName}}" userInput="{{address.lastname}}"/>
-        <fillField stepKey="fillCompany" selector="{{CheckoutShippingAddressModalSection.company}}" userInput="{{address.company}}"/>
-        <fillField stepKey="fillPhoneNumber" selector="{{CheckoutShippingAddressModalSection.telephone}}" userInput="{{address.telephone}}"/>
-        <fillField stepKey="fillStreetAddress" selector="{{CheckoutShippingAddressModalSection.street}}" userInput="{{address.street[0]}}"/>
-        <fillField stepKey="fillCityName" selector="{{CheckoutShippingAddressModalSection.city}}" userInput="{{address.city}}"/>
-        <selectOption stepKey="selectCounty" selector="{{CheckoutShippingAddressModalSection.country}}" userInput="{{address.country_id}}"/>
-        <fillField stepKey="fillZip" selector="{{CheckoutShippingAddressModalSection.postcode}}" userInput="{{address.postcode}}"/>
+        <selectOption stepKey="selectRegion" selector="{{CheckoutShippingSection.region}}" userInput="{{address.state}}" after="fillCityName"/>
     </actionGroup>
 </actionGroups>

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

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontFillNewShippingAddressFormInCheckoutActionGroup">
+        <annotations>
+            <description>Fills in the provided Address details in the New Address form on the Storefront Checkout pages. By default, this works for the Shipping Address but this can be used for Billing Addresses as well if you pass in the correct 'section' argument value</description>
+        </annotations>
+        <arguments>
+            <argument name="address"/>
+            <argument name="section" defaultValue="StorefrontCheckoutShippingNewAddressModalSection"/>
+        </arguments>
+        <fillField stepKey="fillFirstName" selector="{{section.firstName}}" userInput="{{address.firstname}}"/>
+        <fillField stepKey="fillLastName" selector="{{section.lastName}}" userInput="{{address.lastname}}"/>
+        <fillField stepKey="fillCompany" selector="{{section.company}}" userInput="{{address.company}}"/>
+        <fillField stepKey="fillStreetAddress" selector="{{section.street('0')}}" userInput="{{address.street[0]}}"/>
+        <selectOption stepKey="selectCounty" selector="{{section.country}}" userInput="{{address.country_id}}"/>
+        <selectOption stepKey="selectRegion" selector="{{section.region}}" userInput="{{address.state}}"/>
+        <fillField stepKey="fillCityName" selector="{{section.city}}" userInput="{{address.city}}"/>
+        <fillField stepKey="fillZip" selector="{{section.postcode}}" userInput="{{address.postcode}}"/>
+        <fillField stepKey="fillPhoneNumber" selector="{{section.telephone}}" userInput="{{address.telephone}}"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingAddressModalSection.xml renamed to app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutShippingNewAddressModalSection.xml

@@ -8,12 +8,11 @@
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="CheckoutShippingAddressModalSection">
+    <section name="StorefrontCheckoutShippingNewAddressModalSection">
         <element name="firstName" type="input" selector="//div[@id='shipping-new-address-form']//input[@name='firstname']"/>
         <element name="lastName" type="input" selector="//div[@id='shipping-new-address-form']//input[@name='lastname']"/>
         <element name="company" type="input" selector="//div[@id='shipping-new-address-form']//input[@name='company']"/>
-        <element name="street" type="input" selector="//div[@id='shipping-new-address-form']//input[@name='street[0]']"/>
-        <element name="street2" type="input" selector="//div[@id='shipping-new-address-form']//input[@name='street[1]']"/>
+        <element name="street" type="input" parameterized="true" selector="//div[@id='shipping-new-address-form']//input[@name='street[{{index}}]']"/>
         <element name="city" type="input" selector="//div[@id='shipping-new-address-form']//input[@name='city']"/>
         <element name="region" type="select" selector="//div[@id='shipping-new-address-form']//select[@name='region_id']"/>
         <element name="postcode" type="input" selector="//div[@id='shipping-new-address-form']//input[@name='postcode']"/>