Merge pull request magento#4126 from magento-panda/MAGETWO-99402

Fixed issues: - MAGETWO-99402: [MFTF] One Page Checkout with Addresses Search - Custom customer address attribute
Hypernova-Oy · Apr 29, 2019 · a562d34 · a562d34
2 parents 3ccf676 + 2826fdd
commit a562d34
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/...code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressesFromActionGroup.xml b/...code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressesFromActionGroup.xml
@@ -39,4 +39,13 @@
         <click selector="{{AdminEditCustomerAddressesSection.defaultBillingAddressButton}}" stepKey="setDefaultBilling" before="setDefaultShipping"/>
         <click selector="{{AdminEditCustomerAddressesSection.defaultShippingAddressButton}}" stepKey="setDefaultShipping" before="fillPrefixName"/>
     </actionGroup>
+    <actionGroup name="SelectDropdownCustomerAddressAttributeValueActionGroup">
+        <arguments>
+            <argument name="customerAddressAttribute"/>
+            <argument name="optionValue" type="string"/>
+        </arguments>
+        <selectOption selector="{{AdminEditCustomerAddressesSection.dropDownAttribute(customerAddressAttribute.code)}}" userInput="{{optionValue}}" stepKey="selectOptionValue"/>
+        <click selector="{{AdminEditCustomerAddressesSection.save}}" stepKey="saveAddress"/>
+        <waitForPageLoad stepKey="waitForAddressSaved"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
@@ -216,4 +216,18 @@
         <data key="store_id">0</data>
         <data key="website_id">0</data>
     </entity>
+    <entity name="Simple_US_Customer_Two_Addresses" type="customer">
+        <data key="group_id">0</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>
+        <requiredEntity type="address">US_Address_TX</requiredEntity>
+        <requiredEntity type="address">US_Address_NY_Not_Default_Address</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml
@@ -25,6 +25,7 @@
         <element name="city" type="text" selector="//*[@class='modal-component']//input[@name='city']" />
         <element name="country" type="select" selector="//*[@class='modal-component']//select[@name='country_id']" />
         <element name="state" type="select" selector="//*[@class='modal-component']//select[@name='region_id']" />
+        <element name="dropDownAttribute" type="select" selector="//select[@name='{{var1}}']" parameterized="true"/>
         <element name="zipCode" type="text" selector="//*[@class='modal-component']//input[@name='postcode']" />
         <element name="phone" type="text" selector="//*[@class='modal-component']//input[@name='telephone']" />
         <element name="vat" type="text" selector="input[name='vat_id']" />