Merge pull request #133 from magento-pangolin/MC-4555

MC-4555

Author: soumyau

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

@@ -16,15 +16,15 @@
         <element name="billingAddressNotSameCheckbox" type="checkbox" selector="#billing-address-same-as-shipping-checkmo"/>
         <element name="editAddress" type="button" selector="button.action.action-edit-address"/>
         <element name="placeOrderDisabled" type="button" selector="#checkout-payment-method-load button.disabled"/>
-        <element name="update" type="button" selector=".payment-method-billing-address .action.action-update"/>
-        <element name="guestFirstName" type="input" selector=".billing-address-form input[name*='firstname']"/>
-        <element name="guestLastName" type="input" selector=".billing-address-form input[name*='lastname']"/>
-        <element name="guestStreet" type="input" selector=".billing-address-form input[name*='street[0]']"/>
-        <element name="guestCity" type="input" selector=".billing-address-form input[name*='city']"/>
-        <element name="guestCountry" type="select" selector=".billing-address-form select[name*='country_id']"/>
-        <element name="guestRegion" type="select" selector=".billing-address-form select[name*='region_id']"/>
-        <element name="guestPostcode" type="input" selector=".billing-address-form input[name*='postcode']"/>
-        <element name="guestTelephone" type="input" selector=".billing-address-form input[name*='telephone']"/>
+        <element name="update" type="button" selector=".payment-method._active .payment-method-billing-address .action.action-update"/>
+        <element name="guestFirstName" type="input" selector=".payment-method._active .billing-address-form input[name='firstname']"/>
+        <element name="guestLastName" type="input" selector=".payment-method._active .billing-address-form input[name*='lastname']"/>
+        <element name="guestStreet" type="input" selector=".payment-method._active .billing-address-form input[name*='street[0]']"/>
+        <element name="guestCity" type="input" selector=".payment-method._active .billing-address-form input[name*='city']"/>
+        <element name="guestCountry" type="select" selector=".payment-method._active .billing-address-form select[name*='country_id']"/>
+        <element name="guestRegion" type="select" selector=".payment-method._active .billing-address-form select[name*='region_id']"/>
+        <element name="guestPostcode" type="input" selector=".payment-method._active .billing-address-form input[name*='postcode']"/>
+        <element name="guestTelephone" type="input" selector=".payment-method._active .billing-address-form input[name*='telephone']"/>
         <element name="billingAddress" type="text" selector=".payment-method._active div.billing-address-details"/>
         <element name="cartItems" type="text" selector="ol.minicart-items"/>
         <element name="cartItemsArea" type="button" selector="div.block.items-in-cart"/>

app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml

@@ -30,5 +30,6 @@
         <element name="yesNoAttribute" type="select" selector="//select[@id='{{var}}']" parameterized="true" />
         <element name="yesNoOptionAttribute" type="select" selector="//select[@id='{{var}}']/option[2]" parameterized="true" />
         <element name="selectedOption" type="text" selector="//select[@id='{{var}}']/option[@selected='selected']" parameterized="true"/>
+        <element name="attributeLabel" type="text" selector="//span[text()='{{attributeLabel}}']" parameterized="true"/>
     </section>
 </sections>