Skip to content

Commit 5b01902

Browse files
author
Oleksandr Dubovyk
committed
Merge remote-tracking branch 'mainline/2.3-develop' into MC-20112
2 parents 82c8402 + e93feb0 commit 5b01902

File tree

199 files changed

+8964
-1337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+8964
-1337
lines changed

‎app/code/Magento/Braintree/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
"magento/module-sales": "*",
2323
"magento/module-ui": "*",
2424
"magento/module-vault": "*",
25-
"magento/module-multishipping": "*"
25+
"magento/module-multishipping": "*",
26+
"magento/module-theme": "*"
2627
},
2728
"suggest": {
28-
"magento/module-checkout-agreements": "*",
29-
"magento/module-theme": "*"
29+
"magento/module-checkout-agreements": "*"
3030
},
3131
"type": "magento2-module",
3232
"license": [

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

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
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="AdminAssociateBundleProductToWebsitesTest">
12+
<annotations>
13+
<features value="Bundle"/>
14+
<stories value="Create/Edit bundle product in Admin"/>
15+
<title value="Admin should be able to associate bundle product to websites"/>
16+
<description value="Admin should be able to associate bundle product to websites"/>
17+
<testCaseId value="MC-3344"/>
18+
<severity value="CRITICAL"/>
19+
<group value="bundle"/>
20+
<group value="catalog"/>
21+
</annotations>
22+
<before>
23+
<!-- Configure Store URLs -->
24+
<magentoCLI command="config:set {{StorefrontEnableAddStoreCodeToUrls.path}} {{StorefrontEnableAddStoreCodeToUrls.value}}" stepKey="setAddStoreCodeToUrlsToYes"/>
25+
26+
<!-- Create category -->
27+
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
28+
29+
<!-- Create Simple product -->
30+
<createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
31+
32+
<!-- Create Bundle product -->
33+
<createData entity="ApiBundleProductPriceViewRange" stepKey="createBundleProduct">
34+
<requiredEntity createDataKey="createCategory"/>
35+
</createData>
36+
<createData entity="DropDownBundleOption" stepKey="bundleOption">
37+
<requiredEntity createDataKey="createBundleProduct"/>
38+
</createData>
39+
<createData entity="ApiBundleLink" stepKey="createNewBundleLink">
40+
<requiredEntity createDataKey="createBundleProduct"/>
41+
<requiredEntity createDataKey="bundleOption"/>
42+
<requiredEntity createDataKey="createSimpleProduct"/>
43+
</createData>
44+
45+
<!-- Reindex -->
46+
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
47+
48+
<!-- Login as admin -->
49+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
50+
51+
<!--Create website-->
52+
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createSecondWebsite">
53+
<argument name="newWebsiteName" value="{{secondCustomWebsite.name}}"/>
54+
<argument name="websiteCode" value="{{secondCustomWebsite.code}}"/>
55+
</actionGroup>
56+
<!-- Create second store -->
57+
<actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createSecondStoreGroup">
58+
<argument name="website" value="{{secondCustomWebsite.name}}"/>
59+
<argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
60+
<argument name="storeGroupCode" value="{{SecondStoreGroupUnique.code}}"/>
61+
</actionGroup>
62+
<!-- Create second store view -->
63+
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createSecondStoreView">
64+
<argument name="StoreGroup" value="SecondStoreGroupUnique"/>
65+
<argument name="customStore" value="SecondStoreUnique"/>
66+
</actionGroup>
67+
</before>
68+
<after>
69+
<!-- Disabled Store URLs -->
70+
<magentoCLI command="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}" stepKey="setAddStoreCodeToUrlsToNo"/>
71+
72+
<!-- Delete simple product -->
73+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
74+
<!-- Delete bundle product -->
75+
<deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
76+
77+
<!-- Delete second website -->
78+
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
79+
<argument name="websiteName" value="{{secondCustomWebsite.name}}"/>
80+
</actionGroup>
81+
82+
<actionGroup ref="NavigateToAndResetProductGridToDefaultView" stepKey="resetProductGridFilter"/>
83+
84+
<!-- Admin logout -->
85+
<actionGroup ref="logout" stepKey="adminLogout"/>
86+
</after>
87+
88+
<!-- Open product page and assign grouped project to second website -->
89+
<actionGroup ref="filterAndSelectProduct" stepKey="openAdminProductPage">
90+
<argument name="productSku" value="$$createBundleProduct.sku$$"/>
91+
</actionGroup>
92+
<actionGroup ref="AdminAssignProductInWebsiteActionGroup" stepKey="assignProductToSecondWebsite">
93+
<argument name="website" value="{{secondCustomWebsite.name}}"/>
94+
</actionGroup>
95+
<actionGroup ref="AdminUnassignProductInWebsiteActionGroup" stepKey="unassignProductFromDefaultWebsite">
96+
<argument name="website" value="{{_defaultWebsite.name}}"/>
97+
</actionGroup>
98+
<actionGroup ref="saveProductForm" stepKey="saveGroupedProduct"/>
99+
100+
<!-- Assert product is assigned to Second website -->
101+
<actionGroup ref="AssertProductIsAssignedToWebsite" stepKey="seeCustomWebsiteIsChecked">
102+
<argument name="website" value="{{secondCustomWebsite.name}}"/>
103+
</actionGroup>
104+
105+
<!-- Assert product is not assigned to Main website -->
106+
<actionGroup ref="AssertProductIsNotAssignedToWebsite" stepKey="seeMainWebsiteIsNotChecked">
107+
<argument name="website" value="{{_defaultWebsite.name}}"/>
108+
</actionGroup>
109+
110+
<!-- Go to frontend and open product on Main website -->
111+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage">
112+
<argument name="productUrl" value="$$createBundleProduct.custom_attributes[url_key]$$"/>
113+
</actionGroup>
114+
115+
<!-- Assert 404 page -->
116+
<actionGroup ref="StorefrontAssertPageNotFoundErrorOnProductDetailPageActionGroup" stepKey="assertPageNotFoundError">
117+
<argument name="product" value="$$createBundleProduct$$"/>
118+
</actionGroup>
119+
120+
<!-- Assert product is present at Second website -->
121+
<actionGroup ref="StorefrontOpenProductPageUsingStoreCodeInUrlActionGroup" stepKey="openProductPageUsingStoreCodeInUrl">
122+
<argument name="product" value="$$createBundleProduct$$"/>
123+
<argument name="storeView" value="SecondStoreUnique"/>
124+
</actionGroup>
125+
</test>
126+
</tests>

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

Lines changed: 197 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,197 @@
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="StorefrontSortBundleProductsByPriceTest">
12+
<annotations>
13+
<features value="Bundle"/>
14+
<stories value="Bundle products list on Storefront"/>
15+
<title value="Customer should be able to sort bundle products by price when viewing products list"/>
16+
<description value="Customer should be able to sort bundle products by price when viewing products list"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="MC-228"/>
19+
<group value="bundle"/>
20+
</annotations>
21+
<before>
22+
<!-- Create category -->
23+
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
24+
25+
<!-- Create simple products for first bundle product -->
26+
<createData entity="SimpleProduct2" stepKey="createFirstSimpleProduct">
27+
<field key="price">100.00</field>
28+
</createData>
29+
<createData entity="SimpleProduct2" stepKey="createSecondSimpleProduct"/>
30+
31+
<!-- Create first bundle product -->
32+
<createData entity="ApiBundleProductPriceViewRange" stepKey="createFirstBundleProduct">
33+
<requiredEntity createDataKey="createCategory"/>
34+
</createData>
35+
<createData entity="DropDownBundleOption" stepKey="firstProductBundleOption">
36+
<requiredEntity createDataKey="createFirstBundleProduct"/>
37+
</createData>
38+
<createData entity="ApiBundleLink" stepKey="createFirstBundleLink">
39+
<requiredEntity createDataKey="createFirstBundleProduct"/>
40+
<requiredEntity createDataKey="firstProductBundleOption"/>
41+
<requiredEntity createDataKey="createFirstSimpleProduct"/>
42+
</createData>
43+
<createData entity="ApiBundleLink" stepKey="createSecondBundleLink">
44+
<requiredEntity createDataKey="createFirstBundleProduct"/>
45+
<requiredEntity createDataKey="firstProductBundleOption"/>
46+
<requiredEntity createDataKey="createSecondSimpleProduct"/>
47+
</createData>
48+
49+
<!-- Create simple products for second bundle product -->
50+
<createData entity="SimpleProduct2" stepKey="createFirstProduct">
51+
<field key="price">10.00</field>
52+
</createData>
53+
<createData entity="SimpleProduct2" stepKey="createSecondProduct"/>
54+
55+
<!-- Create second bundle product -->
56+
<createData entity="ApiBundleProductPriceViewRange" stepKey="createSecondBundleProduct">
57+
<requiredEntity createDataKey="createCategory"/>
58+
</createData>
59+
<createData entity="DropDownBundleOption" stepKey="secondProductBundleOption">
60+
<requiredEntity createDataKey="createSecondBundleProduct"/>
61+
</createData>
62+
<createData entity="ApiBundleLink" stepKey="createBundleLinkFirst">
63+
<requiredEntity createDataKey="createSecondBundleProduct"/>
64+
<requiredEntity createDataKey="secondProductBundleOption"/>
65+
<requiredEntity createDataKey="createFirstProduct"/>
66+
</createData>
67+
<createData entity="ApiBundleLink" stepKey="createBundleLinkSecond">
68+
<requiredEntity createDataKey="createSecondBundleProduct"/>
69+
<requiredEntity createDataKey="secondProductBundleOption"/>
70+
<requiredEntity createDataKey="createSecondProduct"/>
71+
</createData>
72+
73+
<!-- Create simple products for third bundle product -->
74+
<createData entity="SimpleProduct2" stepKey="createFirstProductForBundle"/>
75+
<createData entity="SimpleProduct2" stepKey="createSecondProductForBundle">
76+
<field key="price">500.00</field>
77+
</createData>
78+
79+
<!-- Create third bundle product -->
80+
<createData entity="ApiBundleProductPriceViewRange" stepKey="createThirdBundleProduct">
81+
<requiredEntity createDataKey="createCategory"/>
82+
</createData>
83+
<createData entity="DropDownBundleOption" stepKey="createThirdProductBundleOption">
84+
<requiredEntity createDataKey="createThirdBundleProduct"/>
85+
</createData>
86+
<createData entity="ApiBundleLink" stepKey="createBundleFirstLink">
87+
<requiredEntity createDataKey="createThirdBundleProduct"/>
88+
<requiredEntity createDataKey="createThirdProductBundleOption"/>
89+
<requiredEntity createDataKey="createFirstProductForBundle"/>
90+
</createData>
91+
<createData entity="ApiBundleLink" stepKey="createBundleSecondLink">
92+
<requiredEntity createDataKey="createThirdBundleProduct"/>
93+
<requiredEntity createDataKey="createThirdProductBundleOption"/>
94+
<requiredEntity createDataKey="createSecondProductForBundle"/>
95+
</createData>
96+
97+
<!-- Perform CLI reindex -->
98+
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
99+
</before>
100+
<after>
101+
<!-- Delete all created data -->
102+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
103+
<deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
104+
<deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
105+
<deleteData createDataKey="createFirstBundleProduct" stepKey="deleteFirstBundleProduct"/>
106+
<deleteData createDataKey="createFirstProduct" stepKey="deleteFirstProduct"/>
107+
<deleteData createDataKey="createSecondProduct" stepKey="deleteSecondProduct"/>
108+
<deleteData createDataKey="createSecondBundleProduct" stepKey="deleteSecondBundleProduct"/>
109+
<deleteData createDataKey="createFirstProductForBundle" stepKey="deleteFirstProductForBundle"/>
110+
<deleteData createDataKey="createSecondProductForBundle" stepKey="deleteSecondProductForBundle"/>
111+
<deleteData createDataKey="createThirdBundleProduct" stepKey="deleteThirdBundleProduct"/>
112+
</after>
113+
114+
<!-- Open created category on Storefront -->
115+
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage">
116+
<argument name="categoryName" value="$$createCategory.name$$"/>
117+
</actionGroup>
118+
119+
<!-- Assert first bundle products in category product grid -->
120+
<actionGroup ref="AssertProductOnCategoryPageActionGroup" stepKey="assertFirstBundleProduct">
121+
<argument name="product" value="$$createFirstBundleProduct$$"/>
122+
</actionGroup>
123+
<actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seePriceRangeFromForFirstBundleProduct">
124+
<argument name="selector" value="{{StorefrontCategoryProductSection.priceFromByProductId($$createFirstBundleProduct.id$$)}}"/>
125+
<argument name="userInput" value="From $100.00"/>
126+
</actionGroup>
127+
<actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seePriceRangeToForFirstBundleProduct">
128+
<argument name="selector" value="{{StorefrontCategoryProductSection.priceToByProductId($$createFirstBundleProduct.id$$)}}"/>
129+
<argument name="userInput" value="To $123.00"/>
130+
</actionGroup>
131+
132+
<!-- Assert second bundle products in category product grid -->
133+
<actionGroup ref="AssertProductOnCategoryPageActionGroup" stepKey="assertSecondBundleProduct">
134+
<argument name="product" value="$$createSecondBundleProduct$$"/>
135+
</actionGroup>
136+
<actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seePriceRangeFromForSecondBundleProduct">
137+
<argument name="selector" value="{{StorefrontCategoryProductSection.priceFromByProductId($$createSecondBundleProduct.id$$)}}"/>
138+
<argument name="userInput" value="From $10.00"/>
139+
</actionGroup>
140+
<actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seePriceRangeToForSecondBundleProduct">
141+
<argument name="selector" value="{{StorefrontCategoryProductSection.priceToByProductId($$createSecondBundleProduct.id$$)}}"/>
142+
<argument name="userInput" value="To $123.00"/>
143+
</actionGroup>
144+
145+
<!-- Assert third bundle products in category product grid -->
146+
<actionGroup ref="AssertProductOnCategoryPageActionGroup" stepKey="assertThirdBundleProduct">
147+
<argument name="product" value="$$createThirdBundleProduct$$"/>
148+
</actionGroup>
149+
<actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seePriceRangeFromForThirdBundleProduct">
150+
<argument name="selector" value="{{StorefrontCategoryProductSection.priceFromByProductId($$createThirdBundleProduct.id$$)}}"/>
151+
<argument name="userInput" value="From $123.00"/>
152+
</actionGroup>
153+
<actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seePriceRangeToForThirdBundleProduct">
154+
<argument name="selector" value="{{StorefrontCategoryProductSection.priceToByProductId($$createThirdBundleProduct.id$$)}}"/>
155+
<argument name="userInput" value="To $500.00"/>
156+
</actionGroup>
157+
158+
<!-- Switch category view to List mode -->
159+
<actionGroup ref="StorefrontSwitchCategoryViewToListMode" stepKey="switchCategoryViewToListMode"/>
160+
161+
<!-- Sort products By Price -->
162+
<actionGroup ref="StorefrontCategoryPageSortProductActionGroup" stepKey="sortProductByPrice"/>
163+
<!-- Set Ascending Direction -->
164+
<actionGroup ref="StorefrontCategoryPageSortAscendingActionGroup" stepKey="setAscendingDirection"/>
165+
166+
<!-- Assert new products positions -->
167+
<actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductFirstPosition">
168+
<argument name="selector" value="{{StorefrontCategoryMainSection.lineProductName('1')}}"/>
169+
<argument name="userInput" value="$$createThirdBundleProduct.name$$"/>
170+
</actionGroup>
171+
<actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductSecondPosition">
172+
<argument name="selector" value="{{StorefrontCategoryMainSection.lineProductName('2')}}"/>
173+
<argument name="userInput" value="$$createFirstBundleProduct.name$$"/>
174+
</actionGroup>
175+
<actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductThirdPosition">
176+
<argument name="selector" value="{{StorefrontCategoryMainSection.lineProductName('3')}}"/>
177+
<argument name="userInput" value="$$createSecondBundleProduct.name$$"/>
178+
</actionGroup>
179+
180+
<!-- Set Descending Direction -->
181+
<actionGroup ref="StorefrontCategoryPageSortDescendingActionGroup" stepKey="setDescendingDirection"/>
182+
183+
<!-- Assert new products positions -->
184+
<actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductNewFirstPosition">
185+
<argument name="selector" value="{{StorefrontCategoryMainSection.lineProductName('1')}}"/>
186+
<argument name="userInput" value="$$createSecondBundleProduct.name$$"/>
187+
</actionGroup>
188+
<actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductNewSecondPosition">
189+
<argument name="selector" value="{{StorefrontCategoryMainSection.lineProductName('2')}}"/>
190+
<argument name="userInput" value="$$createFirstBundleProduct.name$$"/>
191+
</actionGroup>
192+
<actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductNewThirdPosition">
193+
<argument name="selector" value="{{StorefrontCategoryMainSection.lineProductName('3')}}"/>
194+
<argument name="userInput" value="$$createThirdBundleProduct.name$$"/>
195+
</actionGroup>
196+
</test>
197+
</tests>

0 commit comments

Comments
 (0)