MC-37097: Stores are not shown in "Login as Customer: Select Store" modal window on order view page - MFTF tests fix.

Author: engcom-Foxtrot

app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml

@@ -16,17 +16,8 @@
             <argument name="orderId" type="string"/>
         </arguments>
 
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderGridPage"/>
-        <waitForPageLoad stepKey="waitForOrdersPage"/>
-        <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
-        <waitForPageLoad stepKey="waitForClearFilters"/>
-        <click selector="{{AdminOrdersGridSection.filters}}" stepKey="openOrderGridFilters"/>
-        <waitForPageLoad stepKey="waitForClickFilters"/>
-        <fillField selector="{{AdminOrdersGridSection.idFilter}}" userInput="{{orderId}}" stepKey="fillOrderIdFilter"/>
-        <click selector="{{AdminOrdersGridSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
-        <waitForPageLoad stepKey="waitForApplyFilters"/>
-        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickOrderRow"/>
-        <waitForPageLoad stepKey="waitForOrderPageOpened"/>
+        <amOnPage url="{{AdminOrderPage.url(orderId)}}" stepKey="gotoOrderPage"/>
+        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.loginAsCustomer}}" stepKey="clickLoginAsCustomerLink"/>
         <see selector="{{AdminConfirmationModalSection.title}}" userInput="You are about to Login as Customer"
              stepKey="seeModal"/>

app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageManualChooseActionGroup.xml

@@ -17,17 +17,8 @@
             <argument name="storeName" type="string" defaultValue="default"/>
         </arguments>
 
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderGridPage"/>
-        <waitForPageLoad stepKey="waitForOrdersPage"/>
-        <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
-        <waitForPageLoad stepKey="waitForClearFilters"/>
-        <click selector="{{AdminOrdersGridSection.filters}}" stepKey="openOrderGridFilters"/>
-        <waitForPageLoad stepKey="waitForClickFilters"/>
-        <fillField selector="{{AdminOrdersGridSection.idFilter}}" userInput="{{orderId}}" stepKey="fillOrderIdFilter"/>
-        <click selector="{{AdminOrdersGridSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
-        <waitForPageLoad stepKey="waitForApplyFilters"/>
-        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickOrderRow"/>
-        <waitForPageLoad stepKey="waitForOrderPageOpened"/>
+        <amOnPage url="{{AdminOrderPage.url(orderId)}}" stepKey="gotoOrderPage"/>
+        <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.loginAsCustomer}}" stepKey="clickLoginAsCustomerLink"/>
         <see selector="{{AdminConfirmationModalSection.title}}" userInput="Login as Customer: Select Store" stepKey="seeModal"/>
         <see selector="{{AdminConfirmationModalSection.message}}" userInput="Actions taken while in &quot;Login as Customer&quot; will affect actual customer data." stepKey="seeModalMessage"/>

app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseFromOrderPageTest.xml

@@ -60,26 +60,15 @@
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
         </after>
 
-        <!-- Login as Customer from Customer page -->
-        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup"
-                     stepKey="loginAsCustomerFromCustomerPage">
-            <argument name="customerId" value="$$createCustomer.id$$"/>
-            <argument name="storeName" value="{{customStoreGroup.name}}"/>
-        </actionGroup>
-
-        <!-- Place Order as Customer -->
-        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage">
-            <argument name="productUrl" value="$$createProduct.sku$$"/>
-        </actionGroup>
-        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
+        <!-- Create order -->
+        <actionGroup ref="CreateOrderInStoreActionGroup" stepKey="createOrder">
             <argument name="product" value="$$createProduct$$"/>
-            <argument name="productCount" value="1"/>
+            <argument name="customer" value="$$createCustomer$$"/>
+            <argument name="storeView" value="customStoreFR"/>
         </actionGroup>
-        <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="openCart"/>
-        <actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeOrder"/>
-        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderId"/>
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
 
-        <!-- Login as Customer from Customer page -->
+        <!-- Login as Customer from Order page -->
         <actionGroup ref="AdminLoginAsCustomerLoginFromOrderPageManualChooseActionGroup"
                      stepKey="loginAsCustomerFromOrderPage">
             <argument name="orderId" value="{$grabOrderId}"/>

app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml

@@ -59,10 +59,7 @@
             <argument name="product" value="$$createSimpleProduct$$"/>
             <argument name="customer" value="$$createCustomer$$"/>
         </actionGroup>
-        <grabTextFrom selector="{{AdminOrderDetailsInformationSection.orderId}}" stepKey="grabOrderId"/>
-        <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
-            <argument name="orderId" value="$grabOrderId"/>
-        </actionGroup>
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
 
         <!-- Verify Login as Customer Login action works correctly from Order page -->
         <actionGroup ref="AdminLoginAsCustomerLoginFromOrderPageActionGroup"