MC-40169: [JetTeam] Unskip StorefrontRedirectToOrderHistoryTest

Author: Stas Puga

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

@@ -10,17 +10,13 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontRedirectToOrderHistoryTest">
         <annotations>
-            <features value="Redirection Rules"/>
-            <stories value="Create Invoice"/>
-            <title value="Create Invoice"/>
-            <description
-                    value="Check while order printing URL with an id of not relevant order redirects to order history"/>
+            <features value="Sales"/>
+            <stories value="Redirect To Order History"/>
+            <title value="Redirect To Order History"/>
+            <description value="Check while order printing URL with an id of not relevant order redirects to order history"/>
             <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-92854"/>
+            <testCaseId value="MC-28543"/>
             <group value="sales"/>
-            <skip>
-                <issueId value="MQE-2288" />
-            </skip>
         </annotations>
         <before>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
@@ -39,32 +35,32 @@
 
         <!--Log in to Storefront as Customer 1 -->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
-            <argument name="Customer" value="$$createCustomer$$"/>
+            <argument name="Customer" value="$createCustomer$"/>
         </actionGroup>
 
         <!--Create an order at Storefront as Customer 1 -->
         <actionGroup ref="CreateOrderToPrintPageWithSelectedPaymentMethodActionGroup" stepKey="createOrderToPrint">
-            <argument name="Category" value="$$createCategory$$"/>
+            <argument name="Category" value="$createCategory$"/>
         </actionGroup>
 
         <!--Go to 'print order' page by grabbed order id-->
         <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderIdFromURL"/>
-        <wait time="5" stepKey="waitForPrintWindowToOpen" />
+        <comment userInput="BIC workaround" stepKey="waitForPrintWindowToOpen"/>
         <switchToWindow stepKey="switchToPrintPage"/>
         <waitForElement selector="{{SalesOrderPrintSection.isOrderPrintPage}}" stepKey="checkPrintPage"/>
         <openNewTab stepKey="openNewTab"/>
-        <wait time="5" stepKey="waitForNewTabToOpen" />
+        <waitForPageLoad stepKey="waitForNewTabToOpen" />
         <switchToNextTab stepKey="switchForward"/>
         <waitForElement selector="body" stepKey="waitForNewTab3HTML" />
         <amOnPage url="{{StorefrontSalesOrderPrintPage.url({$grabOrderIdFromURL})}}" stepKey="duplicatePrintPage"/>
 
-        <wait time="5" stepKey="waitForDuplicatePrintWindowToOpen" />
+        <waitForPageLoad stepKey="waitForDuplicatePrintWindowToOpen" />
         <switchToWindow stepKey="switchToDuplicatePrintPage"/>
         <waitForElement selector="{{SalesOrderPrintSection.isOrderPrintPage}}" stepKey="checkDuplicatePrintPage"/>
 
         <!--Log out as customer 1-->
         <openNewTab stepKey="openNewTab2"/>
-        <wait time="5" stepKey="waitForNewTabToOpen1" />
+        <waitForPageLoad stepKey="waitForNewTabToOpen1" />
         <switchToNextTab stepKey="switchForward2"/>
         <waitForElement selector="body" stepKey="waitForNewTab2HTML" />
 
@@ -73,24 +69,25 @@
 
         <!--Log in to Storefront as Customer 2 -->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp2">
-            <argument name="Customer" value="$$createCustomer2$$"/>
+            <argument name="Customer" value="$createCustomer2$"/>
         </actionGroup>
 
         <!--Create an order at Storefront as Customer 2 -->
         <actionGroup ref="CreateOrderToPrintPageWithSelectedPaymentMethodActionGroup" stepKey="createOrderToPrint2">
-            <argument name="Category" value="$$createCategory$$"/>
+            <argument name="Category" value="$createCategory$"/>
         </actionGroup>
 
         <!--Try to load 'print order' page with not relevant order id to be redirected to 'order history' page-->
-        <wait time="5" stepKey="waitForPrintWindowToOpen2" />
+        <waitForPageLoad stepKey="waitForPrintWindowToOpen2" />
         <switchToWindow stepKey="switchToPrintPage2"/>
         <waitForElement selector="{{SalesOrderPrintSection.isOrderPrintPage}}" stepKey="checkPrintPage2"/>
 
         <openNewTab stepKey="openNewTab3"/>
-        <wait time="5" stepKey="waitForNewTabToOpen2" />
+        <waitForPageLoad stepKey="waitForNewTabToOpen2" />
         <switchToNextTab stepKey="switchForward4"/>
         <waitForElement selector="body" stepKey="waitForNewTabHTML" />
         <amOnPage url="{{StorefrontSalesOrderPrintPage.url({$grabOrderIdFromURL})}}" stepKey="duplicatePrintPage2"/>
+        <waitForPageLoad stepKey="waitForOpenDuplicatePage" />
         <seeElement selector="{{StorefrontCustomerOrderSection.isMyOrdersSection}}" stepKey="waitOrderHistoryPage"/>
     </test>
 </tests>