Skip to content

Commit 2c6046c

Browse files
viktorpetrykviktorpetryk
committed
MC-19049: [Test Failed]: Magento\FunctionalTestingFramework.functional.AdminZeroSubtotalOrdersWithProcessingStatusTest
1 parent 7eddafd commit 2c6046c

File tree

2 files changed

+33
-32
lines changed

2 files changed

+33
-32
lines changed

‎app/code/Magento/Checkout/Test/Mftf/Test/AdminZeroSubtotalOrdersWithProcessingStatusTest.xml

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,63 +10,63 @@
1010
<test name="AdminZeroSubtotalOrdersWithProcessingStatusTest">
1111
<annotations>
1212
<features value="Checkout"/>
13-
<stories value="MAGETWO-72877: Zero Subtotal Orders have incorrect status"/>
13+
<stories value="Checkout via the Storefront"/>
1414
<title value="Checking status of Zero Subtotal Orders with 'Processing' New Order Status"/>
1515
<description value="Created order should be in Processing status"/>
1616
<severity value="MAJOR"/>
1717
<testCaseId value="MAGETWO-95994"/>
18+
<useCaseId value="MAGETWO-72877"/>
1819
<group value="checkout"/>
1920
</annotations>
2021
<before>
21-
<createData entity="SimpleSubCategory" stepKey="simpleSubCategory"/>
22-
<createData entity="SimpleProduct" stepKey="simpleProduct">
23-
<requiredEntity createDataKey="simpleSubCategory"/>
22+
<!--Create entities-->
23+
<createData entity="SimpleProduct3" stepKey="createProduct"/>
24+
<createData entity="SalesRule100PercentDiscountSpecificCoupon" stepKey="createCartPriceRule"/>
25+
<createData entity="SimpleSalesRuleCoupon" stepKey="createCouponForCartPriceRule">
26+
<requiredEntity createDataKey="createCartPriceRule"/>
2427
</createData>
2528
<createData entity="FreeShippinMethodConfig" stepKey="enableFreeShipping"/>
2629
<createData entity="ZeroSubtotalCheckoutPaymentMethodConfig" stepKey="enableZeroSubtotalCheckout"/>
30+
<!--Login to Admin page-->
2731
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2832
</before>
2933
<after>
30-
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearAdminOrdersGridFilters"/>
31-
<actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteCartPriceRule">
32-
<argument name="ruleName" value="{{SalesRule100PercentDiscount.name}}"/>
33-
</actionGroup>
34+
<!--Delete entities-->
35+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
36+
<deleteData createDataKey="createCartPriceRule" stepKey="deleteCartPriceRule"/>
3437
<createData entity="ZeroSubtotalCheckoutPaymentMethodDefault" stepKey="disableZeroSubtotalCheckout"/>
3538
<createData entity="FreeShippinMethodDefault" stepKey="disableFreeShipping"/>
36-
<deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
37-
<deleteData createDataKey="simpleSubCategory" stepKey="deleteSimpleSubCategory"/>
39+
<!--Clear filters-->
40+
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearAdminOrdersGridFilters"/>
41+
<!--Logout from Admin page-->
3842
<actionGroup ref="logout" stepKey="logout"/>
3943
</after>
4044

41-
<!--Add New Rule-->
42-
<actionGroup ref="AdminCreateCartPriceRuleSpecificCouponActionGroup" stepKey="addNewRule">
43-
<argument name="rule" value="SalesRule100PercentDiscount"/>
44-
<argument name="userPerCoupon" value="99"/>
45+
<!--Navigate to product page-->
46+
<amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToProductPage"/>
47+
48+
<!--Add product to shopping cart-->
49+
<actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProductToCart">
50+
<argument name="productName" value="$$createProduct.name$$"/>
4551
</actionGroup>
4652

47-
<!--Open Product Page-->
48-
<amOnPage url="{{StorefrontProductPage.url($$simpleProduct.name$$)}}" stepKey="openProductPage"/>
53+
<!--Navigate to shopping cart page-->
54+
<actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="navigateToCartPage"/>
4955

5056
<!--Apply Cart Rule On Storefront-->
51-
<actionGroup ref="ApplyCartRuleOnStorefrontActionGroup" stepKey="applyCartRule">
52-
<argument name="product" value="$$simpleProduct$$"/>
53-
<argument name="couponCode" value="{{_defaultCoupon.code}}"/>
57+
<actionGroup ref="StorefrontApplyCouponActionGroup" stepKey="applyCartRule">
58+
<argument name="couponCode" value="$$createCouponForCartPriceRule.code$$"/>
5459
</actionGroup>
55-
<waitForText userInput='You used coupon code "{{_defaultCoupon.code}}"' stepKey="waitForSuccessMessage"/>
56-
<see selector="{{StorefrontMessagesSection.success}}" userInput='You used coupon code "{{_defaultCoupon.code}}"'
57-
stepKey="seeSuccessMessageUsedCouponCode"/>
58-
<waitForElementVisible selector="{{StorefrontCheckoutCartSummarySection.discountAmount}}" time="30"
59-
stepKey="waitForElementVisible"/>
60+
<waitForElementVisible selector="{{StorefrontCheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountAmountVisible"/>
6061

6162
<!--Navigate to Checkout-->
62-
<actionGroup ref="NavigateToCheckoutActionGroup" stepKey="navigateToCheckout"/>
63+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="navigateToCheckout"/>
6364

6465
<!--Place Order with Free Shipping-->
6566
<actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
6667
<argument name="shippingMethod" value="Free Shipping"/>
6768
</actionGroup>
68-
<see selector="{{CheckoutPaymentSection.notAvailablePaymentSolutions}}"
69-
userInput="No Payment Information Required" stepKey="seePaymentInformation"/>
69+
<see selector="{{CheckoutPaymentSection.notAvailablePaymentSolutions}}" userInput="No Payment Information Required" stepKey="seePaymentInformation"/>
7070
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="checkoutPlaceOrder"/>
7171
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
7272

@@ -76,7 +76,6 @@
7676
</actionGroup>
7777
<click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickOrderRow"/>
7878
<waitForPageLoad stepKey="waitForCreatedOrderPageOpened"/>
79-
<see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Processing"
80-
stepKey="seeOrderStatus"/>
79+
<see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus"/>
8180
</test>
8281
</tests>

‎app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@
8282
<data key="uses_per_coupon">2</data>
8383
<data key="simple_free_shipping">1</data>
8484
</entity>
85-
<entity name="SalesRule100PercentDiscount" extends="TestSalesRule" type="SalesRule">
86-
<data key="discountAmount">100</data>
87-
</entity>
8885
<entity name="SaleRule50PercentDiscountNoCoupon" type="SalesRule">
8986
<data key="name" unique="suffix">salesRule</data>
9087
<data key="description">Sales Rule Descritpion</data>
@@ -265,4 +262,9 @@
265262
<requiredEntity type="SalesRuleLabel">SalesRuleLabelDefault</requiredEntity>
266263
<requiredEntity type="SalesRuleLabel">SalesRuleLabelStore1</requiredEntity>
267264
</entity>
265+
266+
<entity name="SalesRule100PercentDiscountSpecificCoupon" extends="SaleRule50PercentDiscountNoCoupon" type="SalesRule">
267+
<data key="discount_amount">100</data>
268+
<data key="coupon_type">SPECIFIC_COUPON</data>
269+
</entity>
268270
</entities>

0 commit comments

Comments
 (0)