Merge remote-tracking branch 'arcticfoxes/MC-4303' into BugFixPR

Author: Joan He

app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfigurationPaymentSection.xml

@@ -10,6 +10,7 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <section name="BraintreeConfigurationPaymentSection">
         <element name="creditCart" type="radio" selector="#braintree"/>
+        <element name="paymentMethodContainer" type="block" selector=".payment-method-braintree"/>
         <element name="paymentMethod" type="radio" selector="//div[@class='payment-group']//input[contains(@id, 'braintree_cc_vault_')]"/>
         <element name="cartFrame" type="iframe" selector="braintree-hosted-field-number"/>
         <element name="monthFrame" type="iframe" selector="braintree-hosted-field-expirationMonth"/>

app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml

@@ -61,10 +61,12 @@
         <!--Fill cart data-->
         <click selector="{{BraintreeConfigurationPaymentSection.creditCart}}" stepKey="SelectBraintreePaymentMethod"/>
         <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <scrollTo selector="{{BraintreeConfigurationPaymentSection.creditCart}}" stepKey="ScrollToCreditCardSection"/>
         <actionGroup ref="StorefrontFillCartDataActionGroup" stepKey="StorefrontFillCartDataActionGroup"/>
         <waitForPageLoad stepKey="waitForPageLoad4"/>
         <!--Place order-->
-        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="PlaceOrder"/>
+        <click selector="{{BraintreeConfigurationPaymentSection.paymentMethodContainer}} {{CheckoutPaymentSection.placeOrder}}"
+               stepKey="PlaceOrder"/>
         <waitForPageLoad stepKey="waitForPageLoad5"/>
 
         <!--Add product to cart again-->

app/code/Magento/Captcha/Test/Mftf/ActionGroup/CaptchaFormsDisplayingActionGroup.xml

@@ -13,7 +13,7 @@
         <waitForPageLoad stepKey="waitForStoresLoaded"/>
         <click selector="{{CaptchaFormsDisplayingSection.config}}" stepKey="ClickToGoConfiguration"/>
         <waitForPageLoad stepKey="waitForConfigurationsLoaded"/>
-        <scrollTo selector="{{CaptchaFormsDisplayingSection.customer}}" stepKey="ScrollToCustomers"/>
+        <scrollTo selector="{{CaptchaFormsDisplayingSection.customer}}" x="0" y="-80" stepKey="ScrollToCustomers"/>
         <click selector="{{CaptchaFormsDisplayingSection.customer}}" stepKey="ClickToCustomers"/>
         <waitForPageLoad stepKey="waitForCustomerConfigurationsLoaded"/>
         <click selector="{{CaptchaFormsDisplayingSection.customerConfig}}" stepKey="ClickToGoCustomerConfiguration"/>

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFiltersSection.xml

@@ -15,7 +15,7 @@
         <element name="apply" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
         <element name="filter" type="button" selector="//div[@class='data-grid-filters-action-wrap']/button" timeout="30"/>
         <element name="typeDropDown" type="multiselect"  selector="//select[@name='type_id']" timeout="30"/>
-        <element name="bundleOption" type="multiselect" selector="//select[@name='type_id']/option[4]" timeout="30"/>
+        <element name="bundleOption" type="multiselect" selector="//select[@name='type_id']/option[@value='bundle']" timeout="30"/>
         <element name="applyFilters" type="button" selector="//button[@class='action-secondary']" timeout="30"/>
         <element name="allCheckbox" type="checkbox" selector="//div[@data-role='grid-wrapper']//label[@data-bind='attr: {for: ko.uid}']" timeout="30"/>
         <element name="actions" type="button" selector="//div[@class='action-select-wrap']/button" timeout="30"/>

app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml

@@ -68,6 +68,7 @@
         <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <waitForPageLoad stepKey="waitForInvoicePageLoad"/>
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
         <click selector="{{AdminOrderDetailsOrderViewSection.invoices}}" stepKey="clickInvoices"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask5" />