Merge branch 'MC-4239' of github.com:magento-borg/magento2ce into MC-4239

Author: nathanjosiah

app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/ConfigureAuthorizenetAcceptjsActionGroup.xml

@@ -7,7 +7,6 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-
     <actionGroup name="ConfigureAuthorizenetAcceptjs">
         <arguments>
             <argument name="paymentAction" type="string"/>
@@ -19,15 +18,14 @@
         <click stepKey="clickOnConfiguration" selector="{{StoresSubmenuSection.configuration}}"/>
         <waitForPageLoad stepKey="waitForSales"/>
         <waitForElementVisible stepKey="waitForVisibleHack" selector="{{AdminMenuSection.currencySetup}}"/>
-        <scrollTo stepKey="scrollToSales" selector="{{ConfigurationListSection.sales}}"/>
-        <click stepKey="clickOnSales" selector="{{ConfigurationListSection.sales}}" />
+        <scrollTo stepKey="scrollToSales" selector="{{StoresConfigurationListSection.sales}}"/>
+        <click stepKey="clickOnSales" selector="{{StoresConfigurationListSection.sales}}" />
         <waitForPageLoad stepKey="waitForPaymentMethods"/>
-        <click stepKey="clickOnPaymentMethods" selector="{{ConfigurationListSection.salesPaymentMethods}}" />
+        <click stepKey="clickOnPaymentMethods" selector="{{StoresConfigurationListSection.salesPaymentMethods}}" />
         <waitForPageLoad stepKey="waitForOpenConfiguration"/>
         <scrollTo stepKey="scrollToOpenConfig" selector="{{AuthorizenetAcceptjsConfigurationSection.openSectionToggle}}"/>
         <conditionalClick stepKey="openConfiguration" selector="{{AuthorizenetAcceptjsConfigurationSection.openSectionToggle}}" dependentSelector="{{AuthorizenetAcceptjsConfigurationSection.alreadyOpenSectionToggle}}" visible="false"/>
 
-
         <!-- Fill Auth.net fields and save -->
         <waitForPageLoad stepKey="waitToFillApiLogin"/>
         <conditionalClick selector="{{AuthorizenetAcceptjsConfigurationSection.paymentActionCheckbox}}" stepKey="uncheckPaymentActionDefault" dependentSelector="{{AuthorizenetAcceptjsConfigurationSection.paymentActionSelectDisabled}}" visible="true"/>
@@ -43,6 +41,6 @@
     </actionGroup>
 
     <actionGroup name="DisableAuthorizenetAcceptjs">
-        <magentoCLI stepKey="disableBrainTree" command="config:set payment/authorizenet_acceptjs/active 0"/>
+        <magentoCLI stepKey="disableAuthorizenetAcceptjs" command="config:set payment/authorizenet_acceptjs/active 0"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/FillPaymentInformationActionGroup.xml

@@ -7,7 +7,6 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-
     <actionGroup name="FillPaymentInformation">
         <click stepKey="clickOnAuthorizenetToggle" selector="{{AuthorizenetCheckoutSection.selectAuthorizenet}}"/>
         <waitForPageLoad stepKey="waitForCardDataSection"/>

app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/ViewAndValidateOrderActionGroup.xml

@@ -7,15 +7,14 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-
     <actionGroup name="ViewAndValidateOrderActionGroup">
         <arguments>
             <argument name="amount" type="string"/>
             <argument name="status" type="string"/>
             <argument name="captureStatus" type="string"/>
             <argument name="closedStatus" type="string"/>
         </arguments>
-        <amOnPage url="/admin" stepKey="navigateToAdmin"/>
+        <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
         <click selector="{{AdminMenuSection.sales}}" stepKey="clickSales"/>
         <waitForPageLoad stepKey="waitForSalesSubsection"/>
         <click selector="{{AdminMenuSection.orders}}" stepKey="clickOrders"/>
@@ -47,7 +46,7 @@
             <argument name="captureStatus" type="string"/>
             <argument name="closedStatus" type="string"/>
         </arguments>
-        <amOnPage url="/admin" stepKey="navigateToAdmin"/>
+        <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
         <click selector="{{AdminMenuSection.sales}}" stepKey="clickSales"/>
         <waitForPageLoad stepKey="waitForSalesSubsection"/>
         <click selector="{{AdminMenuSection.orders}}" stepKey="clickOrders"/>

app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AdminMenuSection.xml

@@ -11,15 +11,13 @@
     <section name="AdminMenuSection">
         <element name="dashboard" type="button" selector="#menu-magento-backend-dashboard"/>
         <element name="sales" type="button" selector="#menu-magento-sales-sales"/>
-        <element name="orders" type="button" selector="//span[text()='Orders']"/>
+        <element name="orders" type="button" selector="//*[@id='menu-magento-sales-sales']//span[text()='Orders']"/>
         <element name="catalog" type="button" selector="#menu-magento-catalog-catalog"/>
         <element name="customers" type="button" selector="#menu-magento-customer-customer"/>
         <element name="marketing" type="button" selector="#menu-magento-backend-marketing"/>
         <element name="content" type="button" selector="#menu-magento-backend-content"/>
         <element name="reports" type="button" selector="#menu-magento-reports-report"/>
         <element name="stores" type="button" selector="#menu-magento-backend-stores"/>
         <element name="system" type="button" selector="#menu-magento-backend-system"/>
-        <element name="findPartners" type="button" selector="#menu-magento-marketplace-partners"/>
-        <element name="currencySetup" type="button" selector="//span[text()='Currency Setup']"/>
     </section>
 </sections>

app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/ShippingMethodsConfigurationSection.xml

@@ -8,9 +8,8 @@
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="ConfigurationListSection">
+    <section name="StoresConfigurationListSection">
         <element name="sales" type="button" selector="#system_config_tabs > div:nth-child(4) > div"/>
-        <element name="salesPaymentMethods" type="button" selector="//span[text()='Payment Methods']"/>
-        <element name="shippingMethods" type="button" selector="//span[text()='Shipping Methods']"/>
+        <element name="salesPaymentMethods" type="button" selector="//a[contains(@class, 'item-nav')]//span[text()='Payment Methods']"/>
     </section>
 </sections>

app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/ConfigurationListSection.xml renamed to app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/StoresConfigurationListSection.xml

@@ -15,6 +15,9 @@
             <description value="Capture an order placed using Authorize.net Accept.js"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-12255"/>
+            <skip>
+                <issueId value="DEVOPS-4604"/>
+            </skip>
             <group value="AuthorizenetAcceptjs"/>
             <group value="ThirdPartyPayments"/>
         </annotations>

app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Test/FullCaptureAuthorizenetAcceptjsTest.xml

@@ -15,6 +15,9 @@
             <description value="Checkout a virtual product with a guest using Authorize.net Accept.js"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-12712"/>
+            <skip>
+                <issueId value="DEVOPS-4604"/>
+            </skip>
             <group value="AuthorizenetAcceptjs"/>
             <group value="ThirdPartyPayments"/>
         </annotations>
@@ -54,8 +57,7 @@
         <waitForPageLoad stepKey="waitForCartToFill"/>
         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCartAgain"/>
         <waitForPageLoad stepKey="waitForCartToFillAgain"/>
-
-
+        
         <!--Checkout steps-->
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="GoToCheckoutFromMinicartActionGroup"/>
         <waitForPageLoad stepKey="waitForCheckoutLoad"/>