Skip to content

Commit 1b6f6eb

Browse files
sidolovsidolov
authored
Merge branch '2.4-develop' into feature-ukraine-regions
2 parents cabbada + d505803 commit 1b6f6eb

File tree

40 files changed

+870
-15
lines changed

40 files changed

+870
-15
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminCheckingBundleSKUsCreationTest.xml

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminCheckingBundleSKUsCreationTest">
12+
<annotations>
13+
<title value="Checking Bundle SKUs creation"/>
14+
<stories value="Checking Bundle SKUs creation"/>
15+
<description value="Checking Bundle product SKUs in items ordered page"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="AC-3898"/>
18+
</annotations>
19+
<before>
20+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
21+
<!-- create category, four simple products -->
22+
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
23+
<createData entity="SimpleProduct" stepKey="simpleProduct1">
24+
<requiredEntity createDataKey="createCategory"/>
25+
<field key="sku">sp1</field>
26+
</createData>
27+
<createData entity="SimpleProduct" stepKey="simpleProduct2">
28+
<requiredEntity createDataKey="createCategory"/>
29+
<field key="sku">sp2</field>
30+
</createData>
31+
<createData entity="SimpleProduct" stepKey="simpleProduct3">
32+
<requiredEntity createDataKey="createCategory"/>
33+
<field key="sku">sp3</field>
34+
</createData>
35+
<createData entity="SimpleProduct" stepKey="simpleProduct4">
36+
<requiredEntity createDataKey="createCategory"/>
37+
<field key="sku">sp4</field>
38+
</createData>
39+
<createData entity="ApiBundleProductPriceViewRange" stepKey="bundleProduct">
40+
<field key="sku">bp1</field>
41+
<requiredEntity createDataKey="createCategory"/>
42+
</createData>
43+
<createData entity="CheckboxOption" stepKey="bundleOption1">
44+
<requiredEntity createDataKey="bundleProduct"/>
45+
</createData>
46+
<createData entity="CheckboxOption" stepKey="bundleOption2">
47+
<requiredEntity createDataKey="bundleProduct"/>
48+
</createData>
49+
<createData entity="ApiBundleLink" stepKey="linkProduct2ToOption1">
50+
<requiredEntity createDataKey="bundleProduct"/>
51+
<requiredEntity createDataKey="bundleOption1"/>
52+
<requiredEntity createDataKey="simpleProduct2"/>
53+
</createData>
54+
<createData entity="ApiBundleLink" stepKey="linkProduct4ToOption1">
55+
<requiredEntity createDataKey="bundleProduct"/>
56+
<requiredEntity createDataKey="bundleOption1"/>
57+
<requiredEntity createDataKey="simpleProduct4"/>
58+
</createData>
59+
<createData entity="ApiBundleLink" stepKey="linkProduct1ToOption2">
60+
<requiredEntity createDataKey="bundleProduct"/>
61+
<requiredEntity createDataKey="bundleOption2"/>
62+
<requiredEntity createDataKey="simpleProduct1"/>
63+
</createData>
64+
<createData entity="ApiBundleLink" stepKey="linkProduct3ToOption2">
65+
<requiredEntity createDataKey="bundleProduct"/>
66+
<requiredEntity createDataKey="bundleOption2"/>
67+
<requiredEntity createDataKey="simpleProduct3"/>
68+
</createData>
69+
<!-- Create customer -->
70+
<createData entity="Simple_US_Customer_NY" stepKey="customer"/>
71+
<magentoCron stepKey="runCronIndex" groups="index"/>
72+
</before>
73+
<after>
74+
<!-- delete created data -->
75+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
76+
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
77+
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
78+
<deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
79+
<deleteData createDataKey="simpleProduct4" stepKey="deleteSimpleProduct4"/>
80+
<deleteData createDataKey="bundleProduct" stepKey="deleteBundleProduct"/>
81+
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
82+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
83+
</after>
84+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefront">
85+
<argument name="Customer" value="$customer$"/>
86+
</actionGroup>
87+
<!-- Navigate to product on storeFront -->
88+
<actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="goToProductPage">
89+
<argument name="productUrlKey" value="$bundleProduct.custom_attributes[url_key]$"/>
90+
</actionGroup>
91+
<!--Click "Customize and Add to Cart" button-->
92+
<click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomize"/>
93+
<click stepKey="selectFourthProduct" selector="{{StorefrontBundledSection.productCheckbox('1','2')}}"/>
94+
<click stepKey="selectFirstProduct" selector="{{StorefrontBundledSection.productCheckbox('2','1')}}"/>
95+
<click selector="{{StorefrontBundledSection.addToCartConfigured}}" stepKey="clickAddToCart"/>
96+
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="navigateToCheckoutPage"/>
97+
<actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
98+
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNextOnShippingStep"/>
99+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder"/>
100+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlacePurchaseOrder"/>
101+
<see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/>
102+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
103+
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrder">
104+
<argument name="orderId" value="{$grabOrderNumber}"/>
105+
</actionGroup>
106+
<grabTextFrom selector="{{AdminOrderItemsOrderedSection.productSkuColumn}}" stepKey="grabSku"/>
107+
<assertEquals stepKey="assertSKU">
108+
<actualResult type="variable">$grabSku</actualResult>
109+
<expectedResult type="string"><![CDATA[SKU: bp1-sp4-sp1]]></expectedResult>
110+
</assertEquals>
111+
</test>
112+
</tests>

‎app/code/Magento/Bundle/Test/Mftf/Test/EditOrderWithBundleProductBackendProductEvenAfterOneOfMoreSelectedOptionsAreRemovedFromAdminTest.xml

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="EditOrderWithBundleProductBackendProductEvenAfterOneOfMoreSelectedOptionsAreRemovedFromAdminTest">
12+
<annotations>
13+
<features value="Bundle"/>
14+
<stories value="Verify that the user is able to checkout bundled product even after one of more selected options are removed from admin"/>
15+
<title value="Verify that the user is able to checkout bundled product even after one of more selected options are removed from admin"/>
16+
<description value="Verify that the user is able to checkout bundled product even after one of more selected options are removed from admin"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="AC-4608"/>
19+
</annotations>
20+
<before>
21+
<!-- Create Customer Account -->
22+
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
23+
24+
<!-- simple product1-->
25+
<createData entity="SimpleProduct" stepKey="SimpleProduct1">
26+
<field key="price">10.00</field>
27+
</createData>
28+
29+
<!-- simple product2 -->
30+
<createData entity="SimpleProduct" stepKey="SimpleProduct2">
31+
<field key="price">15.00</field>
32+
</createData>
33+
34+
<createData entity="ApiBundleProduct" stepKey="createBundleProduct"/>
35+
36+
<createData entity="RadioButtonsOption" stepKey="radioButtonsOption1">
37+
<requiredEntity createDataKey="createBundleProduct"/>
38+
</createData>
39+
40+
<createData entity="RadioButtonsOption" stepKey="radioButtonsOption2">
41+
<requiredEntity createDataKey="createBundleProduct"/>
42+
</createData>
43+
44+
<createData entity="ApiBundleLink" stepKey="LinkOptionToFirstProduct1">
45+
<requiredEntity createDataKey="createBundleProduct"/>
46+
<requiredEntity createDataKey="radioButtonsOption1"/>
47+
<requiredEntity createDataKey="SimpleProduct1"/>
48+
</createData>
49+
<createData entity="ApiBundleLink" stepKey="LinkOptionToSecondProduct12">
50+
<requiredEntity createDataKey="createBundleProduct"/>
51+
<requiredEntity createDataKey="radioButtonsOption2"/>
52+
<requiredEntity createDataKey="SimpleProduct2"/>
53+
</createData>
54+
55+
<!-- Login as admin -->
56+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
57+
</before>
58+
<after>
59+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
60+
<!-- Delete the simple product -->
61+
<deleteData createDataKey="SimpleProduct1" stepKey="DeleteSimpleProduct1"/>
62+
63+
<!-- Delete the simple product -->
64+
<deleteData createDataKey="SimpleProduct2" stepKey="DeleteSimpleProduct2"/>
65+
66+
<deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
67+
68+
<!-- Log out -->
69+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
70+
</after>
71+
72+
<!--Login customer on storefront-->
73+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginCustomer">
74+
<argument name="Customer" value="$$createCustomer$$" />
75+
</actionGroup>
76+
<!--Open Product Page-->
77+
<actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="openBundleProductPage">
78+
<argument name="product" value="$createBundleProduct$"/>
79+
</actionGroup>
80+
<!--Add bundle to cart-->
81+
<actionGroup ref="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup" stepKey="clickAddToCart"/>
82+
<actionGroup ref="StorefrontEnterProductQuantityAndAddToTheCartActionGroup" stepKey="enterProductQuantityAndAddToTheCart">
83+
<argument name="quantity" value="1"/>
84+
</actionGroup>
85+
86+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCart"/>
87+
88+
<see selector="{{StorefrontBundledSection.nthItemOptionsValue('1')}}" userInput="1 x $$SimpleProduct1.name$$ $10.00" stepKey="seeOptionValue1"/>
89+
<see selector="{{StorefrontBundledSection.nthItemOptionsValue('2')}}" userInput="1 x $$SimpleProduct2.name$$ $15.00" stepKey="seeOptionValue2"/>
90+
91+
<openNewTab stepKey="openNewTab"/>
92+
93+
<!--Open bundle product in admin-->
94+
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToProductEditPage">
95+
<argument name="productId" value="$createBundleProduct.id$"/>
96+
</actionGroup>
97+
98+
<!-- Remove second option -->
99+
<actionGroup ref="DeleteBundleOptionByIndexActionGroup" stepKey="deleteSecondOption">
100+
<argument name="deleteIndex" value="1"/>
101+
</actionGroup>
102+
103+
<!-- Save product form -->
104+
<actionGroup ref="SaveProductFormActionGroup" stepKey="clickSaveProduct"/>
105+
106+
<switchToPreviousTab stepKey="switchToPreviousTab"/>
107+
108+
<reloadPage stepKey="reloadPage"/>
109+
110+
<dontSee selector="{{StorefrontBundledSection.nthItemOptionsValue('2')}}" userInput="1 x $$SimpleProduct1.name$$ $15.00" stepKey="assertNotBannerDescription"/>
111+
112+
<actionGroup ref="AssertStorefrontErrorMessageSignInPopupFormActionGroup" stepKey="seeErrorMessage">
113+
<argument name="message" value="Some of the products below do not have all the required options."/>
114+
</actionGroup>
115+
116+
<click stepKey="clickEdit" selector="{{CheckoutCartProductSection.nthEditButton('1')}}"/>
117+
118+
<click selector="{{StorefrontProductInfoMainSection.updateCart}}" stepKey="clickUpdateCartButton"/>
119+
120+
<click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
121+
122+
<see selector="{{CheckoutHeaderSection.shippingMethodStep}}" userInput="Shipping" stepKey="checkShippingHeader"/>
123+
124+
</test>
125+
</tests>

0 commit comments

Comments
 (0)