Skip to content

Commit f4d64de

Browse files
zakdmazakdma
committed
MC-10263: Verify Shopping Cart Persistence under long-term cookie
1 parent fbefdb4 commit f4d64de

File tree

2 files changed

+44
-31
lines changed

2 files changed

+44
-31
lines changed

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,21 @@
6464
<grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
6565
<seeInCurrentUrl url="{{AdminOrderDetailsPage.url('$grabOrderId')}}" stepKey="seeViewOrderPageInvoice"/>
6666
</actionGroup>
67+
68+
<!--Filter invoices by order id -->
69+
<actionGroup name="filterInvoiceGridByOrderId">
70+
<arguments>
71+
<argument name="orderId" type="string"/>
72+
</arguments>
73+
<amOnPage url="{{InvoicesPage.url}}" stepKey="navigateToInvoicesGridPage"/>
74+
<conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
75+
<click selector="{{InvoicesGridSection.filter}}" stepKey="clickFilter"/>
76+
<fillField selector="{{InvoicesFiltersSection.orderNum}}" userInput="{{orderId}}" stepKey="fillOrderIdForFilter"/>
77+
<click selector="{{AdminOrdersGridSection.applyFilters}}" stepKey="clickApplyFilters"/>
78+
</actionGroup>
79+
80+
<!--Filter invoices by order id -->
81+
<actionGroup name="openInvoiceByOrderId" extends="filterInvoiceGridByOrderId">
82+
<click selector="{{InvoicesGridSection.firstRow}}" stepKey="clickToOpenInvoice"/>
83+
</actionGroup>
6784
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="AdminCreateInvoiceTest">
1212
<annotations>
1313
<features value="Invoice Creation"/>
@@ -23,22 +23,23 @@
2323
<createData entity="_defaultProduct" stepKey="createProduct">
2424
<requiredEntity createDataKey="createCategory"/>
2525
</createData>
26+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2627
</before>
2728
<after>
28-
<amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
2929
<deleteData createDataKey="createCategory" stepKey="deleteProduct1"/>
3030
<deleteData createDataKey="createProduct" stepKey="deleteCategory1"/>
31+
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderGridFilters"/>
32+
<amOnPage url="{{InvoicesPage.url}}" stepKey="navigateToInvoicesGridPage"/>
33+
<actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearInvoicesGridFilters"/>
34+
<actionGroup ref="logout" stepKey="logoutFromAdmin"/>
3135
</after>
3236

3337
<!-- todo: Create an order via the api instead of driving the browser -->
34-
<amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
35-
<waitForPageLoad stepKey="waitForPageLoad1"/>
36-
<moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
37-
<click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
38-
<waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
39-
<click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickCart"/>
40-
<click selector="{{StorefrontMiniCartSection.goToCheckout}}" stepKey="goToCheckout"/>
41-
<waitForPageLoad stepKey="waitForPageLoad2"/>
38+
<amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToProductPage"/>
39+
<actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProductToCart">
40+
<argument name="productName" value="$$createProduct.name$$"/>
41+
</actionGroup>
42+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
4243
<fillField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
4344
<fillField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
4445
<fillField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>
@@ -52,35 +53,30 @@
5253
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
5354
<waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
5455
<click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
56+
<!-- Checkout select Check/Money Order payment -->
57+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
5558
<waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
5659
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
5760
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
5861
<!-- end todo -->
5962

60-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
63+
<actionGroup ref="OpenOrderById" stepKey="openCreatedOrder">
64+
<argument name="orderId" value="{$grabOrderNumber}"/>
65+
</actionGroup>
66+
<!--Create invoice-->
67+
<actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startCreateInvoice"/>
68+
<!--Submit invoice-->
69+
<actionGroup ref="SubmitInvoice" stepKey="submitInvoice"/>
6170

62-
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="onAdminOrdersPage"/>
63-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
64-
<actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
65-
<fillField selector="{{OrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum"/>
66-
<click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
67-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
68-
69-
<click selector="{{OrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
70-
<click selector="{{OrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
71-
<click selector="{{AdminInvoiceNewSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
72-
<see selector="{{OrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
71+
<see selector="{{OrderDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus"/>
7372
<click selector="{{OrderDetailsOrderViewSection.invoices}}" stepKey="clickInvoices"/>
7473
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask5" />
7574
<see selector="{{OrderDetailsInvoicesSection.content}}" userInput="{$grabOrderNumber}" stepKey="seeInvoice1"/>
76-
<see selector="{{OrderDetailsInvoicesSection.content}}" userInput="John Doe" stepKey="seeInvoice2"/>
77-
<click selector="{{OrderDetailsOrderViewSection.information}}" stepKey="clickInformation"/>
78-
<see selector="{{OrderDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus"/>
79-
<amOnPage url="{{InvoicesPage.url}}" stepKey="goToInvoices"/>
80-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask6" />
81-
<click selector="{{InvoicesGridSection.filter}}" stepKey="clickFilters"/>
82-
<fillField selector="{{InvoicesFiltersSection.orderNum}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum2"/>
83-
<click selector="{{InvoicesGridSection.firstRow}}" stepKey="clickInvoice2"/>
84-
<see selector="{{InvoiceDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus2"/>
75+
<see selector="{{OrderDetailsInvoicesSection.content}}" userInput="{{CustomerEntityOne.fullname}}" stepKey="seeInvoice2"/>
76+
77+
<actionGroup ref="openInvoiceByOrderId" stepKey="openAndFilterInvoicesGrid">
78+
<argument name="orderId" value="{$grabOrderNumber}"/>
79+
</actionGroup>
80+
<see selector="{{InvoiceDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeCorrectOrderStatus"/>
8581
</test>
8682
</tests>

0 commit comments

Comments
 (0)