ACQE-6260: In-Context Checkout with PayPal Express Checkout with API Credentials from checkout page1

Author: DattaAmrita

app/code/Magento/Paypal/Test/Mftf/Test/AdminPaypalExpressCheckoutWithAPICredentialsFromCheckoutPageTest.xml

@@ -15,8 +15,6 @@
             <severity value="MAJOR"/>
             <testCaseId value="AC-5206"/>
             <group value="3rd_party_integration"/>
-            <!--            <group value="paypalExpress"/>-->
-            <!--            <group value="pr_exclude"/>-->
         </annotations>
         <before>
             <createData entity="SimpleProduct" stepKey="simpleProduct"/>
@@ -25,6 +23,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <!--Add new tax rates. Go to tax rule page -->
             <actionGroup ref="AddNewTaxRuleActionGroup" stepKey="addFirstTaxRuleActionGroup"/>
+            <waitForElementVisible selector="{{AdminTaxRulesSection.ruleName}}" stepKey="waitForRuleName"/>
             <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="{{TaxRule.name}}"/>
             <!-- Adding product rate tax for NY -->
             <actionGroup ref="AddNewTaxRateNoZipUIActionGroup" stepKey="addProductTaxRateForCA">
@@ -34,15 +33,11 @@
             <actionGroup ref="ClickSaveButtonActionGroup" stepKey="saveAnotherTaxRule">
                 <argument name="message" value="You saved the tax rule."/>
             </actionGroup>
-            <!-- Enable flat rate method -->
-            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
             <actionGroup ref="AdminPayPalExpressCheckoutEnableActionGroup" stepKey="ConfigPayPalExpress">
                 <argument name="credentials" value="SamplePaypalExpressConfig2"/>
             </actionGroup>
         </before>
         <after>
-            <!-- Disable flat rate method -->
-            <magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
             <magentoCLI command="config:set payment/paypal_express/active 0" stepKey="disablePayPalExpress"/>
             <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
@@ -58,7 +53,6 @@
                 <argument name="submenuUiId" value="{{AdminMenuStoresTaxZonesAndRates.dataUiId}}"/>
             </actionGroup>
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteProductTaxRule1">
-                <!--            <argument name="name" value="{{SimpleTaxCA.identifier}}-{{SimpleTaxCA.rate}}"/>-->
                 <argument name="name" value="{{SimpleTaxTexas.identifier}}-{{SimpleTaxTexas.rate}}"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
             </actionGroup>
@@ -90,7 +84,7 @@
         </actionGroup>
         <!-- Go to Order review -->
         <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="goToCheckoutPaymentPage"/>
-        <waitForElement selector="{{StorefrontCheckoutPaymentMethodSection.checkPaymentMethodByName('PayPal Express Checkout')}}" stepKey="waitForPayPalExpressCheckoutIsPresent"/>
+        <waitForElementClickable selector="{{StorefrontCheckoutPaymentMethodSection.checkPaymentMethodByName('PayPal Express Checkout')}}" stepKey="waitForPayPalExpressCheckoutIsPresent"/>
         <click selector="{{StorefrontCheckoutPaymentMethodSection.checkPaymentMethodByName('PayPal Express Checkout')}}" stepKey="clickPayPalExpressCheckout"/>
         <waitForPageLoad stepKey="waitForPaypalExpressCheckoutToBeLoaded"/>
         <!-- Click on Paypal paypal button-->
@@ -101,16 +95,8 @@
         <actionGroup ref="PayPalAssertTransferLineAndShippingMethodNotExistActionGroup" stepKey="assertPayPalSettings"/>
         <!--Click PayPal button and go back to Magento site-->
         <actionGroup ref="StorefrontPaypalSwitchBackToMagentoFromCheckoutPageActionGroup" stepKey="goBackToMagentoSite"/>
-        <!--        <waitForElementVisible selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="waitForOrderNumberToBeGrabbed"/>-->
-        <!--        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>-->
-        <!--        <waitForText selector="{{CheckoutSuccessMainSection.success}}" userInput="We'll email you an order confirmation with details and tracking info." stepKey="seeSuccessMessage"/>-->
-        <!--        &lt;!&ndash; Go to order page &ndash;&gt;-->
-        <!--        <actionGroup ref="OpenOrderByIdActionGroup" stepKey="openFirstOrderPage">-->
-        <!--            <argument name="orderId" value="{$grabOrderNumber}"/>-->
-        <!--        </actionGroup>-->
-        <!-- See order successful Page instead of Order Review Page -->
-        <waitForElement selector="{{CheckoutSuccessMainSection.successTitle}}" stepKey="waitForLoadSuccessPageTitle"/>
-        <waitForElement selector="{{CheckoutSuccessMainSection.success}}" stepKey="waitForLoadSuccessPage"/>
+        <waitForElementVisible selector="{{CheckoutSuccessMainSection.successTitle}}" stepKey="waitForLoadSuccessPageTitle"/>
+        <waitForElementVisible selector="{{CheckoutSuccessMainSection.success}}" stepKey="waitForLoadSuccessPage"/>
         <!--Grab order number-->
         <waitForElementVisible selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="waitForOrderNumberToBeGrabbed"/>
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="grabOrderNumber"/>
@@ -125,7 +111,7 @@
         <!--Open Invoice-->
         <waitForElementClickable selector="{{AdminOrderDetailsOrderViewSection.invoices}}" stepKey="waitForInvoicesTabClickable" />
         <click selector="{{AdminOrderDetailsOrderViewSection.invoices}}" stepKey="openInvoicesTab"/>
-        <!--Assert Invoice amount -->
-        <waitForElementVisible selector="{{AdminOrderDetailsMainActionsSection.invoiceTabDetails}}" stepKey="waitForInvoiceSectionDetailsToBeAppeared"/>
+        <!--Check Invoice Section -->
+        <waitForElementVisible selector="{{AdminOrderDetailsMainActionsSection.invoiceTabContent}}" stepKey="waitForInvoiceSectionContentToBeAppeared"/>
     </test>
 </tests>

app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml

@@ -17,7 +17,7 @@
         <element name="hold" type="button" selector="#order-view-hold-button" timeout="30"/>
         <element name="invoice" type="button" selector="#order_invoice" timeout="30"/>
         <element name="invoiceTab" type="button" selector="#sales_order_view_tabs_order_invoices" timeout="30"/>
-        <element name="invoiceTabDetails" type="text" selector="#sales_order_view_tabs_order_invoices_content > div > div.admin__data-grid-wrap > table > tbody > tr > td" timeout="30"/>
+        <element name="invoiceTabContent" type="text" selector="#sales_order_view_tabs_order_invoices_content > div > div.admin__data-grid-wrap > table > tbody > tr > td" timeout="30"/>
         <element name="ship" type="button" selector="#order_ship" timeout="30"/>
         <element name="reorder" type="button" selector="#order_reorder" timeout="30"/>
         <element name="edit" type="button" selector="#order_edit" timeout="30"/>