Skip to content

Commit 82a8b48

Browse files
sivaschenkosivaschenko
authored
Merge branch '2.4-develop' into elasticsearch-version-fix
2 parents 202e152 + fe90b76 commit 82a8b48

File tree

7 files changed

+215
-8
lines changed

7 files changed

+215
-8
lines changed

‎app/code/Magento/Backup/Test/Mftf/Data/BackupConfigData.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="EnableBackupFunctionality">
12+
<data key="path">system/backup/functionality_enabled</data>
13+
<data key="value">1</data>
14+
</entity>
15+
<entity name="DisableBackupFunctionality">
16+
<!-- Magento default value -->
17+
<data key="path">system/backup/functionality_enabled</data>
18+
<data key="value">0</data>
19+
</entity>
20+
</entities>

‎app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-94176"/>
1919
<group value="backup"/>
20-
<skip>
21-
<issueId value="MC-5807"/>
22-
</skip>
2320
</annotations>
21+
<before>
22+
<magentoCLI command="config:set {{EnableBackupFunctionality.path}} {{EnableBackupFunctionality.value}}" stepKey="setEnableBackup"/>
23+
</before>
24+
<after>
25+
<magentoCLI command="config:set {{DisableBackupFunctionality.path}} {{DisableBackupFunctionality.value}}" stepKey="setDisableBackup"/>
26+
</after>
2427

2528
<!--Login to admin area-->
2629
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddCustomerDefaultAddressActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<fillField stepKey="fillZip" userInput="{{Address.postcode}}" selector="{{StorefrontCustomerAddressFormSection.zip}}"/>
2828
<selectOption stepKey="selectCountry" userInput="{{Address.country}}" selector="{{StorefrontCustomerAddressFormSection.country}}"/>
2929
<click stepKey="checkUseAsDefaultBillingAddressCheckBox" selector="{{StorefrontCustomerAddressFormSection.useAsDefaultBillingAddressCheckBox}}"/>
30+
<scrollTo selector="{{StorefrontCustomerAddressFormSection.useAsDefaultShippingAddressCheckBox}}" stepKey="scrollToUseAsDefaultShippingAddressCheckbox"/>
3031
<click stepKey="checkUseAsDefaultShippingAddressCheckBox" selector="{{StorefrontCustomerAddressFormSection.useAsDefaultShippingAddressCheckBox}}"/>
3132
<click stepKey="saveCustomerAddress" selector="{{StorefrontCustomerAddressFormSection.saveAddress}}"/>
3233
<waitForPageLoad stepKey="waitForPageLoad"/>

‎app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleWithConditionAndNotDefaultConditionOperatorActionGroup.xml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminCreateCartPriceRuleWithConditionAndNotDefaultConditionOperatorActionGroup" extends="AdminCreateCartPriceRuleActionGroup">
12+
<annotations>
13+
<description>EXTENDS: AdminCreateCartPriceRuleActionGroup. Sets the not default Condition value and Product Child Attribute for Actions on the Admin Cart Price Rule creation/edit page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="childAttribute" type="string" defaultValue="SKU"/>
17+
<argument name="conditionOperator" type="string" defaultValue="is"/>
18+
<argument name="actionValue" type="string" defaultValue="{{ApiSimpleProduct.sku}}"/>
19+
</arguments>
20+
<click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" after="fillDiscountAmount" stepKey="clickOnActionTab"/>
21+
<click selector="{{AdminCartPriceRulesFormSection.conditions}}" after="clickOnActionTab" stepKey="clickConditionDropDownMenu"/>
22+
<waitForPageLoad stepKey="waitForDropDownOpened"/>
23+
<selectOption selector="{{AdminCartPriceRulesFormSection.childAttribute}}" userInput="{{childAttribute}}" after="clickConditionDropDownMenu" stepKey="selectConditionAttribute"/>
24+
<waitForPageLoad after="selectConditionAttribute" stepKey="waitForOperatorOpened"/>
25+
<click selector="{{AdminCartPriceRulesFormSection.condition('is')}}" after="waitForOperatorOpened" stepKey="clickToChooseCondition"/>
26+
<selectOption selector="{{AdminCartPriceRulesFormSection.operator}}" userInput="{{conditionOperator}}" after="clickToChooseCondition" stepKey="selectOperator"/>
27+
<waitForPageLoad after="selectOperator" stepKey="waitForOperatorOpened1"/>
28+
<click selector="{{AdminCartPriceRulesFormSection.condition('...')}}" after="waitForOperatorOpened1" stepKey="clickToChooserIcon"/>
29+
<fillField selector="{{AdminCartPriceRulesFormSection.actionValue}}" userInput="{{actionValue}}" after="clickToChooserIcon" stepKey="choseNeededCategoryFromCategoryGrid"/>
30+
<click selector="{{AdminCartPriceRulesFormSection.applyAction}}" after="choseNeededCategoryFromCategoryGrid" stepKey="applyAction"/>
31+
</actionGroup>
32+
</actionGroups>

‎app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontApplyCartPriceRuleToBundleChildProductTest.xml

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="StorefrontApplyCartPriceRuleToBundleChildProductTest">
11+
<annotations>
12+
<features value="SalesRule"/>
13+
<stories value="Create cart price rule"/>
14+
<title value="Checking Cart Price Rule for bundle products"/>
15+
<description value="Checking Cart Price Rule for bundle products"/>
16+
<severity value="AVERAGE"/>
17+
<testCaseId value="MC-36654"/>
18+
<useCaseId value="MC-35548"/>
19+
<group value="salesRule"/>
20+
</annotations>
21+
<before>
22+
<createData entity="SimpleProduct2" stepKey="createSimpleProduct1">
23+
<field key="price">5.00</field>
24+
</createData>
25+
<createData entity="SimpleProduct2" stepKey="createSimpleProduct2">
26+
<field key="price">3.00</field>
27+
</createData>
28+
<createData entity="SimpleProduct2" stepKey="createSimpleProduct3">
29+
<field key="price">7.00</field>
30+
</createData>
31+
<createData entity="SimpleProduct2" stepKey="createSimpleProduct4">
32+
<field key="price">18.00</field>
33+
</createData>
34+
<createData entity="ApiBundleProduct" stepKey="createBundleProduct"/>
35+
<createData entity="DropDownBundleOption" stepKey="createDropDownBundleOption">
36+
<requiredEntity createDataKey="createBundleProduct"/>
37+
</createData>
38+
<createData entity="CheckboxOption" stepKey="createCheckboxBundleOption">
39+
<requiredEntity createDataKey="createBundleProduct"/>
40+
</createData>
41+
<createData entity="ApiBundleLink" stepKey="linkDropDownOptionToProduct1">
42+
<requiredEntity createDataKey="createBundleProduct"/>
43+
<requiredEntity createDataKey="createDropDownBundleOption"/>
44+
<requiredEntity createDataKey="createSimpleProduct1"/>
45+
</createData>
46+
<createData entity="ApiBundleLink" stepKey="linkDropDownOptionToProduct2">
47+
<requiredEntity createDataKey="createBundleProduct"/>
48+
<requiredEntity createDataKey="createDropDownBundleOption"/>
49+
<requiredEntity createDataKey="createSimpleProduct2"/>
50+
</createData>
51+
<createData entity="ApiBundleLink" stepKey="linkCheckboxOptionToProduct3">
52+
<requiredEntity createDataKey="createBundleProduct"/>
53+
<requiredEntity createDataKey="createCheckboxBundleOption"/>
54+
<requiredEntity createDataKey="createSimpleProduct3"/>
55+
</createData>
56+
<createData entity="ApiBundleLink" stepKey="linkCheckboxOptionToProduct4">
57+
<requiredEntity createDataKey="createBundleProduct"/>
58+
<requiredEntity createDataKey="createCheckboxBundleOption"/>
59+
<requiredEntity createDataKey="createSimpleProduct4"/>
60+
</createData>
61+
62+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
63+
<!-- Make Attribute 'sku' accessible for Promo Rule Conditions -->
64+
<actionGroup ref="NavigateToEditProductAttributeActionGroup" stepKey="editSkuAttribute">
65+
<argument name="ProductAttribute" value="sku"/>
66+
</actionGroup>
67+
<actionGroup ref="ChangeUseForPromoRuleConditionsProductAttributeActionGroup" stepKey="changeAttributePromoRule">
68+
<argument name="option" value="1"/>
69+
</actionGroup>
70+
<actionGroup ref="AdminCartPriceRuleDeleteAllActionGroup" stepKey="deleteCartPriceRules"/>
71+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
72+
<argument name="indices" value="cataloginventory_stock"/>
73+
</actionGroup>
74+
</before>
75+
<after>
76+
<deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
77+
<deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>
78+
<deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
79+
<deleteData createDataKey="createSimpleProduct3" stepKey="deleteSimpleProduct3"/>
80+
<deleteData createDataKey="createSimpleProduct4" stepKey="deleteSimpleProduct4"/>
81+
82+
<actionGroup ref="AdminDeleteCartPriceRuleActionGroup" stepKey="deleteCartPriceRule">
83+
<argument name="ruleName" value="CatPriceRule"/>
84+
</actionGroup>
85+
<!-- Revert Attribute 'sku' to it's default value (not accessible for Promo Rule Conditions) -->
86+
<actionGroup ref="NavigateToEditProductAttributeActionGroup" stepKey="editSkuAttribute">
87+
<argument name="ProductAttribute" value="sku"/>
88+
</actionGroup>
89+
<actionGroup ref="ChangeUseForPromoRuleConditionsProductAttributeActionGroup" stepKey="changeAttributePromoRule">
90+
<argument name="option" value="0"/>
91+
</actionGroup>
92+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
93+
</after>
94+
<!-- Start to create new cart price rule via SKU conditions and not default condition value -->
95+
<actionGroup ref="AdminCreateCartPriceRuleWithConditionAndNotDefaultConditionOperatorActionGroup" stepKey="createRule">
96+
<argument name="ruleName" value="CatPriceRule"/>
97+
<argument name="conditionOperator" value="is one of"/>
98+
<argument name="actionValue" value="$createSimpleProduct1.sku$, $createSimpleProduct2.sku$"/>
99+
</actionGroup>
100+
<!-- Add Bundle product with simple1 and simple3 products to the cart -->
101+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductStorefront">
102+
<argument name="productUrl" value="$createBundleProduct.custom_attributes[url_key]$"/>
103+
</actionGroup>
104+
<actionGroup ref="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup" stepKey="clickCustomizeAndAddToCart"/>
105+
<actionGroup ref="StorefrontSelectBundleProductDropDownOptionActionGroup" stepKey="addSimpleProduct1">
106+
<argument name="productName" value="$createSimpleProduct1.name$"/>
107+
</actionGroup>
108+
<checkOption selector="{{StorefrontBundledSection.checkboxOptionThreeProducts(CheckboxOption.title, '1')}}" stepKey="selectFirstCheckboxOption"/>
109+
<actionGroup ref="StorefrontAddToTheCartButtonActionGroup" stepKey="addToTheCartBundleProduct"/>
110+
<see selector="{{StorefrontMessagesSection.success}}" userInput="You added $createBundleProduct.name$ to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
111+
<!-- Click "mini cart" icon-->
112+
<actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCart"/>
113+
<waitForPageLoad stepKey="waitForDetailsOpen"/>
114+
<!--Check all products and Cart Subtotal and Discount is only for SimpleProduct1-->
115+
<actionGroup ref="StorefrontCheckCartTotalWithDiscountCategoryActionGroup" stepKey="checkDiscountIsAppliedOnlyForSimple1productOnly">
116+
<argument name="subtotal" value="12.00"/>
117+
<argument name="shipping" value="5.00"/>
118+
<argument name="discount" value="0.50"/>
119+
<argument name="total" value="16.50"/>
120+
</actionGroup>
121+
<!-- Clear Shopping cart -->
122+
<actionGroup ref="DeleteProductFromShoppingCartActionGroup" stepKey="clearShoppingCart">
123+
<argument name="productName" value="$createBundleProduct.name$"/>
124+
</actionGroup>
125+
<!-- Add Bundle product with simple2 and simple3 products to the cart -->
126+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductStorefront2">
127+
<argument name="productUrl" value="$createBundleProduct.custom_attributes[url_key]$"/>
128+
</actionGroup>
129+
<actionGroup ref="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup" stepKey="clickCustomizeAndAddToCart2"/>
130+
<actionGroup ref="StorefrontSelectBundleProductDropDownOptionActionGroup" stepKey="addSimpleProduct2">
131+
<argument name="productName" value="$createSimpleProduct2.name$"/>
132+
</actionGroup>
133+
<checkOption selector="{{StorefrontBundledSection.checkboxOptionThreeProducts(CheckboxOption.title, '1')}}" stepKey="selectFirstCheckboxOption2"/>
134+
<actionGroup ref="StorefrontAddToTheCartButtonActionGroup" stepKey="addToTheCartBundleProduct2"/>
135+
<!--Click "mini cart" icon-->
136+
<actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCart2"/>
137+
<waitForPageLoad stepKey="waitForDetailsOpen2"/>
138+
<!--Check all products and Cart Subtotal and Discount is only for SimpleProduct2-->
139+
<actionGroup ref="StorefrontCheckCartTotalWithDiscountCategoryActionGroup" stepKey="checkDiscountIsAppliedOnlyForSimple2productOnly">
140+
<argument name="subtotal" value="10.00"/>
141+
<argument name="shipping" value="5.00"/>
142+
<argument name="discount" value="0.30"/>
143+
<argument name="total" value="14.70"/>
144+
</actionGroup>
145+
</test>
146+
</tests>

‎app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleForBundleProductTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="StorefrontCartPriceRuleForBundleProductTest">
10+
<test name="StorefrontCartPriceRuleForBundleProductTest" deprecated="StorefrontApplyCartPriceRuleToBundleChildProductTest">
1111
<annotations>
1212
<features value="SalesRule"/>
1313
<stories value="MAGETWO-28921 - Cart Price Rule for bundle products"/>
@@ -17,7 +17,7 @@
1717
<testCaseId value="MAGETWO-28921"/>
1818
<group value="SalesRule"/>
1919
<skip>
20-
<issueId value="MQE-2288" />
20+
<issueId value="DEPRECATED">Use StorefrontApplyCartPriceRuleToBundleChildProductTest instead</issueId>
2121
</skip>
2222
</annotations>
2323

@@ -100,7 +100,7 @@
100100
<argument name="option" value="0" />
101101
</actionGroup>
102102

103-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
103+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
104104

105105
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
106106
<magentoCron groups="index" stepKey="reindexInvalidatedIndices2" />

‎app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,13 @@
2626
<createData entity="Simple_US_Customer" stepKey="customer"/>
2727
</before>
2828

29-
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
30-
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
29+
<!-- Perform reindex and flush cache -->
30+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
31+
<argument name="indices" value=""/>
32+
</actionGroup>
33+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
34+
<argument name="tags" value=""/>
35+
</actionGroup>
3136

3237
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
3338
<argument name="Customer" value="$$customer$$"/>

0 commit comments

Comments
 (0)