Skip to content

Commit 9a2f265

Browse files
yolouieseyolouiese
committed
Merge branch '2.4-develop' of github.com:magento/magento2 into 1703-deleted-tags-not-removed
2 parents c716884 + 237c2b1 commit 9a2f265

File tree

189 files changed

+3304
-888
lines changed

Some content is hidden

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

189 files changed

+3304
-888
lines changed

‎app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<?= /* @noEscape */ $secureRenderer->renderTag(
1313
'script',
1414
[
15-
'src' => '"' . $block->escapeJs($block->getTrackingUrl()) .'"',
15+
'src' => $block->getTrackingUrl(),
1616
'async' => true,
1717
],
1818
'&nbsp;',

‎app/code/Magento/Backend/view/adminhtml/layout/default.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
<argument name="bugreport_url" xsi:type="string">https://github.com/magento/magento2/issues</argument>
7171
</arguments>
7272
</block>
73-
7473
</container>
7574
</container>
7675
</referenceContainer>

‎app/code/Magento/Backend/view/adminhtml/requirejs-config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
var config = {
77
map: {
88
'*': {
9-
'mediaUploader': 'Magento_Backend/js/media-uploader',
10-
'mage/translate': 'Magento_Backend/js/translate'
9+
'mediaUploader': 'Magento_Backend/js/media-uploader'
1110
}
1211
}
1312
};

‎app/code/Magento/Backup/Test/Mftf/ActionGroup/AdminAssertBackupLinkAbsentInMenuActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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="AdminAssertBackupLinkAbsentInMenuActionGroup">
12+
<annotations>
13+
<description>Verify 'Backup' link is absent in admin menu.</description>
14+
</annotations>
15+
16+
<click selector="{{AdminMenuSection.menuItem('magento-backend-system')}}" stepKey="clickSystem"/>
17+
<dontSeeElement selector="{{AdminMenuSection.menuItem('magento-backup-system-tools-backup')}}" stepKey="dontSeeBackup"/>
18+
</actionGroup>
19+
</actionGroups>

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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="AdminSystemBackupMenuTest">
12+
<annotations>
13+
<features value="Backup"/>
14+
<stories value="Backup menu not visible if config disabled"/>
15+
<title value="Backup menu not visible if backup config disabled"/>
16+
<description value="Disable backup config and check backup menu isn't visible"/>
17+
<severity value="AVERAGE"/>
18+
<testCaseId value="MC-36292"/>
19+
<group value="backup"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23+
</before>
24+
<after>
25+
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
26+
</after>
27+
28+
<actionGroup ref="AdminAssertBackupLinkAbsentInMenuActionGroup" stepKey="verifyBackupLinkAbsentInMenu"/>
29+
</test>
30+
</tests>

‎app/code/Magento/Backup/etc/adminhtml/menu.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
99
<menu>
10-
<add id="Magento_Backup::system_tools_backup" title="Backups" translate="title" module="Magento_Backup" sortOrder="30" parent="Magento_Backend::system_tools" action="backup/index" resource="Magento_Backup::backup"/>
10+
<add id="Magento_Backup::system_tools_backup" title="Backups" translate="title" module="Magento_Backup" sortOrder="30" parent="Magento_Backend::system_tools" action="backup/index" resource="Magento_Backup::backup" dependsOnConfig="system/backup/functionality_enabled"/>
1111
</menu>
1212
</config>

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductSetAdvancedPricingActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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="AdminBundleProductSetAdvancedPricingActionGroup" extends="ProductSetAdvancedPricingActionGroup">
12+
<annotations>
13+
<description>Sets the provided Advanced Pricing on the Admin Bundle Product creation/edit page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="priceView" type="string" defaultValue="Price Range"/>
17+
</arguments>
18+
<remove keyForRemoval="selectProductCustomGroupValue"/>
19+
<selectOption selector="{{AdminProductFormAdvancedPricingSection.bundleAdvancedPriceView}}" userInput="{{priceView}}" stepKey="selectPriceView" before="clickDoneButton"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminProductFormAdvancedPricingSection">
12+
<element name="bundleAdvancedPriceView" type="select" selector="div[data-index='advanced-pricing'] select[name='product[price_view]']"/>
13+
</section>
14+
</sections>

‎app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<element name="bundleOptionXInputType" type="select" selector="[name='bundle_options[bundle_options][{{x}}][type]']" parameterized="true"/>
2121
<element name="bundleOptionXRequired" type="checkbox" selector="[name='bundle_options[bundle_options][{{x}}][required]']" parameterized="true"/>
2222
<element name="bundleOptionXProductYQuantity" type="input" selector="[name='bundle_options[bundle_options][{{x}}][bundle_selections][{{y}}][selection_qty]']" parameterized="true"/>
23+
<element name="bundleOptionXProductYPrice" type="input" selector="[name='bundle_options[bundle_options][{{x}}][bundle_selections][{{y}}][selection_price_value]']" parameterized="true"/>
2324
<element name="addProductsToOption" type="button" selector="[data-index='modal_set']" timeout="30"/>
2425
<element name="nthAddProductsToOption" type="button" selector="//tr[{{var}}]//button[@data-index='modal_set']" timeout="30" parameterized="true"/>
2526
<element name="bundlePriceType" type="select" selector="bundle_options[bundle_options][0][bundle_selections][0][selection_price_type]"/>

‎app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<element name="priceTo" type="text" selector=".product-info-price .price-to"/>
1414
<element name="minPrice" type="text" selector="span[data-price-type='minPrice']"/>
1515
<element name="maxPrice" type="text" selector="span[data-price-type='minPrice']"/>
16+
<element name="asLowAsFinalPrice" type="text" selector="div.price-box.price-final_price p.minimal-price > span.price-final_price span.price"/>
17+
<element name="fixedFinalPrice" type="text" selector="div.price-box.price-final_price > span.price-final_price span.price"/>
1618
<element name="productBundleOptionsCheckbox" type="checkbox" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{childName}}')]/../input" parameterized="true" timeout="30"/>
1719
</section>
1820
</sections>

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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="BundleProductWithDynamicTierPriceInCartTest" extends="BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest">
11+
<annotations>
12+
<stories value="Add bundle product to cart on storefront"/>
13+
<title value="Customer should get the right subtotal in cart when the bundle product with dynamic tier price added to the cart"/>
14+
<description value="Customer should be able to add bundle product with dynamic tier price to the cart and get the right price"/>
15+
<severity value="CRITICAL"/>
16+
</annotations>
17+
18+
<before>
19+
<createData entity="VirtualProduct" stepKey="createProductForBundleItem1">
20+
<field key="price">50.00</field>
21+
</createData>
22+
<createData entity="SimpleProduct2" stepKey="createProductForBundleItem2">
23+
<field key="price">100.00</field>
24+
</createData>
25+
</before>
26+
27+
<remove keyForRemoval="clickDynamicPriceSwitcher"/>
28+
<remove keyForRemoval="fillBundlePrice"/>
29+
<remove keyForRemoval="disableDynamicSku"/>
30+
<remove keyForRemoval="fillBundleOption1Price"/>
31+
<remove keyForRemoval="selectPercentPrice"/>
32+
<remove keyForRemoval="fillBundleOption2Price"/>
33+
<assertEquals message="ExpectedPrice" stepKey="assertBundleProductPrice">
34+
<actualResult type="variable">grabProductPrice</actualResult>
35+
<expectedResult type="string">$75.00</expectedResult>
36+
</assertEquals>
37+
<actionGroup ref="AssertSubTotalOnStorefrontMiniCartActionGroup" stepKey="assertSubTotalOnStorefrontMiniCart">
38+
<argument name="subTotal" value="$75.00"/>
39+
</actionGroup>
40+
</test>
41+
</tests>

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

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
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="BundleProductWithOptionTierPriceInCartTest" extends="BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest">
11+
<annotations>
12+
<stories value="Add bundle product to cart on storefront"/>
13+
<title value="Customer should get the right subtotal in cart when the bundle product with tier price for sub-item added to the cart"/>
14+
<description value="Customer should be able to add bundle product with tier price for sub-item price to the cart and get the right price"/>
15+
<severity value="CRITICAL"/>
16+
</annotations>
17+
18+
<before>
19+
<createData entity="VirtualProduct" stepKey="createProductForBundleItem1">
20+
<field key="price">50.00</field>
21+
</createData>
22+
<createData entity="SimpleProduct2" stepKey="createProductForBundleItem2">
23+
<field key="price">100.00</field>
24+
</createData>
25+
<createData entity="TierProductPrice50PercentDiscount" stepKey="addTierPrice">
26+
<requiredEntity createDataKey="createProductForBundleItem2"/>
27+
</createData>
28+
</before>
29+
30+
<remove keyForRemoval="clickDynamicPriceSwitcher"/>
31+
<remove keyForRemoval="fillBundlePrice"/>
32+
<remove keyForRemoval="disableDynamicSku"/>
33+
<remove keyForRemoval="fillBundleOption1Price"/>
34+
<remove keyForRemoval="selectPercentPrice"/>
35+
<remove keyForRemoval="fillBundleOption2Price"/>
36+
<remove keyForRemoval="addProductTierPrice"/>
37+
<actionGroup ref="SaveProductFormActionGroup" after="addBundleOption2" stepKey="saveBundleProduct"/>
38+
<grabTextFrom selector="{{StorefrontProductInfoMainSection.fixedFinalPrice}}" stepKey="grabProductPrice"/>
39+
<assertEquals message="ExpectedPrice" stepKey="assertBundleProductPrice">
40+
<actualResult type="variable">grabProductPrice</actualResult>
41+
<expectedResult type="string">$100.00</expectedResult>
42+
</assertEquals>
43+
<actionGroup ref="AssertSubTotalOnStorefrontMiniCartActionGroup" stepKey="assertSubTotalOnStorefrontMiniCart">
44+
<argument name="subTotal" value="$100.00"/>
45+
</actionGroup>
46+
</test>
47+
</tests>

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

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
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="BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest">
11+
<annotations>
12+
<features value="Bundle"/>
13+
<stories value="Add bundle product to cart on storefront"/>
14+
<title value="Customer should get the right subtotal in cart when the bundle product with tier price and bundle items with fixed and percent price added to the cart"/>
15+
<description value="Customer should be able to add bundle product with tier price and bundle items with fixed and percent price to the cart and get the right price"/>
16+
<severity value="CRITICAL"/>
17+
<testCaseId value="MC-26543"/>
18+
<group value="bundle"/>
19+
<group value="catalog"/>
20+
</annotations>
21+
22+
<before>
23+
<createData entity="SimpleProduct2" stepKey="createProductForBundleItem1">
24+
<field key="price">100.00</field>
25+
</createData>
26+
<createData entity="SimpleProduct2" stepKey="createProductForBundleItem2">
27+
<field key="price">100.00</field>
28+
</createData>
29+
<magentoCron groups="index" stepKey="runCronIndex"/>
30+
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
31+
</before>
32+
33+
<after>
34+
<deleteData createDataKey="createProductForBundleItem1" stepKey="deleteProductForBundleItem1"/>
35+
<deleteData createDataKey="createProductForBundleItem2" stepKey="deleteProductForBundleItem2"/>
36+
<actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteBundle">
37+
<argument name="product" value="BundleProduct"/>
38+
</actionGroup>
39+
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductsGridFilters"/>
40+
<waitForPageLoad stepKey="waitForClearProductsGridFilters"/>
41+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
42+
</after>
43+
44+
<amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
45+
<waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
46+
<click selector="{{AdminProductFormBundleSection.dynamicSkuToggle}}" stepKey="disableDynamicSku"/>
47+
<click selector="{{AdminProductFormBundleSection.dynamicPrice}}" stepKey="clickDynamicPriceSwitcher"/>
48+
<fillField selector="{{AdminProductFormBundleSection.priceField}}" userInput="100" stepKey="fillBundlePrice"/>
49+
<actionGroup ref="FillMainBundleProductFormActionGroup" stepKey="fillMainFieldsForBundle"/>
50+
<actionGroup ref="AddBundleOptionWithOneProductActionGroup" stepKey="addBundleOption1">
51+
<argument name="x" value="0"/>
52+
<argument name="n" value="1"/>
53+
<argument name="prodOneSku" value="$createProductForBundleItem1.sku$"/>
54+
<argument name="prodTwoSku" value=""/>
55+
<argument name="optionTitle" value="Option1"/>
56+
<argument name="inputType" value="checkbox"/>
57+
</actionGroup>
58+
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYPrice('0', '0')}}" userInput="100" stepKey="fillBundleOption1Price"/>
59+
<selectOption selector="{{AdminProductFormBundleSection.bundlePriceType}}" userInput="Percent" stepKey="selectPercentPrice"/>
60+
<actionGroup ref="AddBundleOptionWithOneProductActionGroup" stepKey="addBundleOption2">
61+
<argument name="x" value="1"/>
62+
<argument name="n" value="2"/>
63+
<argument name="prodOneSku" value="$createProductForBundleItem2.sku$"/>
64+
<argument name="prodTwoSku" value=""/>
65+
<argument name="optionTitle" value="Option2"/>
66+
<argument name="inputType" value="checkbox"/>
67+
</actionGroup>
68+
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYPrice('1', '0')}}" userInput="100" stepKey="fillBundleOption2Price"/>
69+
<scrollToTopOfPage stepKey="scrollToTopOfTheProductPage"/>
70+
<actionGroup ref="AdminBundleProductSetAdvancedPricingActionGroup" stepKey="addProductTierPrice">
71+
<argument name="quantity" value="1"/>
72+
<argument name="price" value="Discount"/>
73+
<argument name="amount" value="50"/>
74+
<argument name="priceView" value="As Low as"/>
75+
</actionGroup>
76+
<amOnPage url="{{StorefrontProductPage.url(BundleProduct.urlKey)}}" stepKey="goToStorefront"/>
77+
<waitForPageLoad stepKey="waitForStorefront"/>
78+
<!--Assert Bundle Product Price-->
79+
<grabTextFrom selector="{{StorefrontProductInfoMainSection.asLowAsFinalPrice}}" stepKey="grabProductPrice"/>
80+
<assertEquals message="ExpectedPrice" stepKey="assertBundleProductPrice">
81+
<actualResult type="variable">grabProductPrice</actualResult>
82+
<expectedResult type="string">$150.00</expectedResult>
83+
</assertEquals>
84+
<actionGroup ref="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup" stepKey="clickOnCustomizeAndAddToCartButton"/>
85+
<actionGroup ref="StorefrontEnterProductQuantityAndAddToTheCartActionGroup" stepKey="enterProductQuantityAndAddToTheCart">
86+
<argument name="quantity" value="1"/>
87+
</actionGroup>
88+
<actionGroup ref="AssertSubTotalOnStorefrontMiniCartActionGroup" stepKey="assertSubTotalOnStorefrontMiniCart">
89+
<argument name="subTotal" value="$150.00"/>
90+
</actionGroup>
91+
</test>
92+
</tests>

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@
163163

164164
<!-- Save the settings -->
165165
<scrollToTopOfPage stepKey="scrollToTop"/>
166-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveTaxOptions"/>
167-
<waitForPageLoad stepKey="waitForTaxSaved"/>
166+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveTaxOptions"/>
167+
168168
<see userInput="You saved the configuration." selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccess"/>
169169

170170
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
@@ -192,8 +192,7 @@
192192

193193
<!-- Save the settings -->
194194
<scrollToTopOfPage stepKey="scrollToTop"/>
195-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveTaxOptions"/>
196-
<waitForPageLoad stepKey="waitForTaxSaved"/>
195+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveTaxOptions"/>
197196
<see userInput="You saved the configuration." selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccess"/>
198197

199198
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

‎app/code/Magento/Captcha/etc/adminhtml/system.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<depends>
5858
<field id="enable">1</field>
5959
</depends>
60-
<frontend_class>required-entry</frontend_class>
60+
<frontend_class>required-entry validate-range range-1-8</frontend_class>
6161
</field>
6262
<field id="symbols" translate="label comment" type="text" sortOrder="8" showInDefault="1" canRestore="1">
6363
<label>Symbols Used in CAPTCHA</label>

0 commit comments

Comments
 (0)