Skip to content

Commit 2f74c3a

Browse files
Sahil.kumarManjusha.S
authored andcommitted
MC-26873:Moved all actions into ActionGroups
1 parent 64c005e commit 2f74c3a

File tree

1 file changed

+55
-40
lines changed

1 file changed

+55
-40
lines changed

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

Lines changed: 55 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -19,70 +19,85 @@
1919
</annotations>
2020

2121
<before>
22-
<!-- Login as admin -->
23-
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
24-
<!-- create virtual product -->
25-
<createData entity="VirtualProduct" stepKey="createVirtualProduct"/>
26-
<!-- create US customer -->
27-
<createData entity="Simple_US_Customer_NY" stepKey="createDefaultCustomer"/>
22+
2823
<!-- create default category -->
2924
<createData entity="_defaultCategory" stepKey="createCategory"/>
25+
26+
<!-- create virtual product -->
27+
<createData entity="VirtualProduct" stepKey="createVirtualProduct">
28+
<requiredEntity createDataKey="createCategory"/>
29+
</createData>
30+
3031
<!-- assign virtual product to default category -->
3132
<createData entity="AssignProductToCategory" stepKey="assignCategoryToVirtualProduct">
3233
<requiredEntity createDataKey="createCategory"/>
3334
<requiredEntity createDataKey="createVirtualProduct"/>
3435
</createData>
36+
37+
<!-- create customer -->
38+
<createData entity="CustomerEntityOne" stepKey="createCustomer"/>
3539
</before>
3640

3741
<after>
3842
<!-- delete category,product,customer -->
3943
<deleteData createDataKey="createVirtualProduct" stepKey="deleteVirtualProduct"/>
4044
<deleteData createDataKey="createCategory" stepKey="deleteSimpleCategory"/>
41-
<deleteData createDataKey="createDefaultCustomer" stepKey="deleteCustomer"/>
45+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
4246
</after>
4347

44-
<!-- Login to storefront as customer -->
45-
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
46-
<argument name="Customer" value="$createDefaultCustomer$"/>
48+
<!-- Login as customer -->
49+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="storefrontCustomerLogin">
50+
<argument name="Customer" value="$$createCustomer$$"/>
4751
</actionGroup>
48-
<waitForPageLoad stepKey="waitForCatalogPageLoad"/>
49-
<!-- go to category -->
50-
<actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="navigateToCategoryPage">
51-
<argument name="category" value="$$createCategory$$"/>
52+
53+
<!-- Customer placed order from storefront with payment method -->
54+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCart">
55+
<argument name="product" value="$$createVirtualProduct$$"/>
5256
</actionGroup>
53-
<!-- select the product image and add to cart -->
54-
<click selector="//img[@class='product-image-photo']" stepKey="clickProduct1"/>
55-
<actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
56-
<argument name="productName" value="$$createVirtualProduct.name$$"/>
57+
58+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
59+
60+
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="clickOnPlaceOrder">
61+
<argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
62+
<argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
5763
</actionGroup>
58-
<!-- click on cart icon and proceed to checkout -->
59-
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMiniCartAsCustomer"/>
60-
<click selector="{{CheckoutShippingGuestInfoSection.placeOrder}}" stepKey="clickPlaceOrder"/>
61-
<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSectionLoaded"/>
62-
<waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="waitForPlaceOrderButton"/>
63-
<seeElement selector="{{CheckoutSuccessMainSection.success}}" stepKey="orderIsSuccessfullyPlaced"/>
64-
<waitForElementVisible selector="{{CheckoutSuccessMainSection.success}}" stepKey="waitForSuccess"/>
65-
<!-- get order number -->
64+
65+
<!-- order number is captured for future validation -->
6666
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="getOrderNumber"/>
67+
6768
<!-- Log in as admin-->
6869
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
69-
<!-- go to orders page and validate order details -->
70+
71+
<!-- Go to orders page and validate the order details -->
7072
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="addFilterToGridAndOpenOrder">
7173
<argument name="orderId" value="{$getOrderNumber}"/>
7274
</actionGroup>
73-
<see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="verifyOrderStatus"/>
74-
<click selector="{{AdminOrderDetailsInformationSection.orderStatus}}" stepKey="openOrderDetailPage"/>
75-
<!-- create an invoice for the order-->
76-
<actionGroup ref="AdminCreateInvoiceActionGroup" stepKey="createNewInvoice"/>
77-
<!-- Find the Order in storefront -->
78-
<amOnPage url="{StorefrontHomePage.url}" stepKey="goToStorefrontHomePage" />
79-
<amOnPage url="{{StorefrontGuestOrderSearchPage.url}}" stepKey="amOnOrdersAndReturns"/>
80-
<waitForPageLoad stepKey="waitForStorefrontMyOrdersPage"/>
81-
<!-- Click 'Reorder' link -->
82-
<click selector="{{StorefrontCustomerMyOrdersSection.reorderLink}}" stepKey="clickReturnLink"/>
83-
<waitForPageLoad stepKey="waitForPageLoad2"/>
84-
<!--Check that product from order is visible in cart after reorder -->
85-
<seeElement selector="{{CheckoutCartProductSection.ProductLinkByName($$createVirtualProduct.name$$)}}" stepKey="seeProductInCart"/>
75+
76+
<!--Create Invoice-->
77+
<actionGroup ref="AdminCreateInvoiceActionGroup" stepKey="createInvoice"/>
78+
79+
<!-- Open My Account Page from Customer dropdown -->
80+
<actionGroup ref="StorefrontOpenMyAccountPageActionGroup" stepKey="goToMyAccountPage"/>
81+
82+
<!-- Goto Orders tab from Sidebar menu in Storefront page -->
83+
<actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="goToSidebarMenu">
84+
<argument name="menu" value="My Orders"/>
85+
</actionGroup>
86+
87+
<!-- Clicking View Order from My Orders Grid -->
88+
<actionGroup ref="StorefrontClickViewOrderLinkOnMyOrdersPageActionGroup" stepKey="clickViewOrder"/>
89+
90+
<!-- Clicking on Reorder link from Order Details Tab -->
91+
<click selector="{{StorefrontCustomerOrderViewSection.reorder}}" stepKey="clickReorder"/>
92+
93+
94+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMiniCart"/>
95+
96+
<!-- Reordering the virtual product -->
97+
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="reorderVirtualProduct">
98+
<argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
99+
<argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
100+
</actionGroup>
86101

87102
</test>
88103
</tests>

0 commit comments

Comments
 (0)