Skip to content

Commit 69e13d4

Browse files
magento-engcom-teammagento-engcom-team
authored
[Magento Community Engineering] Community Contributions - 2.4-develop
 - merged latest code from mainline branch
2 parents b79ac29 + 7b71772 commit 69e13d4

28 files changed

+104
-75
lines changed

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByDescriptionTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
<features value="CatalogSearch"/>
1313
<group value="CatalogSearch"/>
1414
</annotations>
15-
<!-- Perform reindex and flush cache -->
1615
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
17-
<argument name="indices" value=""/>
16+
<argument name="indices" value="cataloginventory_stock catalog_product_price"/>
1817
</actionGroup>
1918
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
2019
<argument name="tags" value=""/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByNameTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
<group value="CatalogSearch"/>
1414
</annotations>
1515

16-
<!-- Perform reindex and flush cache -->
1716
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
18-
<argument name="indices" value=""/>
17+
<argument name="indices" value="cataloginventory_stock catalog_product_price"/>
1918
</actionGroup>
2019
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
2120
<argument name="tags" value=""/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByPriceTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
<group value="CatalogSearch"/>
1414
</annotations>
1515

16-
<!-- Perform reindex and flush cache -->
1716
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
18-
<argument name="indices" value=""/>
17+
<argument name="indices" value="cataloginventory_stock catalog_product_price"/>
1918
</actionGroup>
2019
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
2120
<argument name="tags" value=""/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByShortDescriptionTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
<group value="CatalogSearch"/>
1414
</annotations>
1515

16-
<!-- Perform reindex and flush cache -->
1716
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
18-
<argument name="indices" value=""/>
17+
<argument name="indices" value="cataloginventory_stock catalog_product_price"/>
1918
</actionGroup>
2019
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
2120
<argument name="tags" value=""/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductBySkuTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
<group value="CatalogSearch"/>
1414
</annotations>
1515

16-
<!-- Perform reindex and flush cache -->
1716
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
18-
<argument name="indices" value=""/>
17+
<argument name="indices" value="cataloginventory_stock catalog_product_price"/>
1918
</actionGroup>
2019
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
2120
<argument name="tags" value=""/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartBundleDynamicTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@
4343
</actionGroup>
4444
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
4545

46-
<!-- Perform reindex and flush cache -->
47-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
48-
<argument name="indices" value=""/>
49-
</actionGroup>
46+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
5047
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
5148
<argument name="tags" value=""/>
5249
</actionGroup>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartBundleFixedTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,7 @@
5454
</actionGroup>
5555
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
5656

57-
<!-- Perform reindex and flush cache -->
58-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
59-
<argument name="indices" value=""/>
60-
</actionGroup>
57+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
6158
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
6259
<argument name="tags" value=""/>
6360
</actionGroup>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartConfigurableTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@
2525
<argument name="category" value="$$createCategory$$"/>
2626
</actionGroup>
2727

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

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartDownloadableTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@
2727
<requiredEntity createDataKey="createProduct"/>
2828
</createData>
2929

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

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartGroupedTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@
2727
<requiredEntity createDataKey="simple1"/>
2828
</createData>
2929

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

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@
2323
<requiredEntity createDataKey="createCategory"/>
2424
</createData>
2525

26-
<!-- Perform reindex and flush cache -->
27-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
28-
<argument name="indices" value=""/>
29-
</actionGroup>
26+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
3027
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
3128
<argument name="tags" value=""/>
3229
</actionGroup>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartVirtualTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@
2323
<requiredEntity createDataKey="createCategory"/>
2424
</createData>
2525

26-
<!-- Perform reindex and flush cache -->
27-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
28-
<argument name="indices" value=""/>
29-
</actionGroup>
26+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
3027
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
3128
<argument name="tags" value=""/>
3229
</actionGroup>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchEmptyResultsTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@
2424
<requiredEntity createDataKey="createCategory"/>
2525
</createData>
2626

27-
<!-- Perform reindex and flush cache -->
28-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
29-
<argument name="indices" value=""/>
30-
</actionGroup>
27+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
3128
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
3229
<argument name="tags" value=""/>
3330
</actionGroup>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchProductBySkuTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@
2323
<requiredEntity createDataKey="createCategory"/>
2424
</createData>
2525

26-
<!-- Perform reindex and flush cache -->
27-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
28-
<argument name="indices" value=""/>
29-
</actionGroup>
26+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
3027
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
3128
<argument name="tags" value=""/>
3229
</actionGroup>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchEntitySimpleProductTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@
3131
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAdmin"/>
3232
</after>
3333

34-
<!-- Perform reindex and flush cache -->
35-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
36-
<argument name="indices" value=""/>
37-
</actionGroup>
34+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
3835
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
3936
<argument name="tags" value=""/>
4037
</actionGroup>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontQuickSearchConfigurableChildrenTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,7 @@
7272
<requiredEntity createDataKey="createSimpleProduct"/>
7373
</createData>
7474

75-
<!-- Perform reindex -->
76-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
77-
<argument name="indices" value=""/>
78-
</actionGroup>
75+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
7976
</before>
8077
<after>
8178
<deleteData createDataKey="createConfigurableProduct" stepKey="deleteConfigurableProduct"/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontUpdateSearchTermEntityTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@
2525
<requiredEntity createDataKey="createCategory1"/>
2626
</createData>
2727

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

‎app/code/Magento/Config/Model/Config/PathValidator.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace Magento\Config\Model\Config;
88

9+
use Magento\Config\Model\Config\Structure\Element\Field;
910
use Magento\Framework\Exception\ValidatorException;
1011

1112
/**
@@ -40,6 +41,11 @@ public function __construct(Structure $structure)
4041
*/
4142
public function validate($path)
4243
{
44+
$element = $this->structure->getElementByConfigPath($path);
45+
if ($element instanceof Field && $element->getConfigPath()) {
46+
$path = $element->getConfigPath();
47+
}
48+
4349
$allPaths = $this->structure->getFieldPaths();
4450

4551
if (!array_key_exists($path, $allPaths)) {

‎app/code/Magento/Config/Model/Config/Structure.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public function getElementByConfigPath($path)
191191
{
192192
$allPaths = $this->getFieldPaths();
193193

194-
if (isset($allPaths[$path])) {
194+
if (isset($allPaths[$path]) && is_array($allPaths[$path])) {
195195
$path = array_shift($allPaths[$path]);
196196
}
197197

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AssertStorefrontProductAttributeLabelVisibleActionGroup.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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="AssertStorefrontProductAttributeLabelVisibleActionGroup">
12+
<arguments>
13+
<argument name="productAttributeLabel" type="string"/>
14+
</arguments>
15+
<see selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" userInput="{{productAttributeLabel}}" stepKey="seeProductAttributeLabel"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AssertStorefrontProductAttributeOptionVisibleActionGroup.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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="AssertStorefrontProductAttributeOptionVisibleActionGroup">
12+
<arguments>
13+
<argument name="productAttributeOption" type="string"/>
14+
</arguments>
15+
<see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{productAttributeOption}}" stepKey="seeProductAttributeOption"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductDetailsTest/StorefrontConfigurableProductBasicInfoTest.xml

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,35 @@
3838
</after>
3939

4040
<!-- Verify configurable product details in storefront product view -->
41-
<amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="amOnConfigurableProductPage"/>
42-
<waitForPageLoad stepKey="wait"/>
43-
<see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="seeProductName"/>
44-
<see userInput="{{_defaultProduct.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="seeProductSku"/>
41+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="amOnConfigurableProductPage">
42+
<argument name="productUrl" value="{{_defaultProduct.urlKey}}"/>
43+
</actionGroup>
44+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="wait"/>
45+
<actionGroup ref="StorefrontAssertProductNameOnProductPageActionGroup" stepKey="seeProductName">
46+
<argument name="productName" value="{{_defaultProduct.name}}"/>
47+
</actionGroup>
48+
<actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeProductSku">
49+
<argument name="productSku" value="{{_defaultProduct.sku}}"/>
50+
</actionGroup>
4551
<see userInput="As low as" selector="{{StorefrontProductInfoMainSection.productPriceLabel}}" stepKey="seeProductPriceLabel"/>
46-
<see userInput="IN STOCK" selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="seeProductStockStatus"/>
47-
<see userInput="1.00" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="seeProductPrice"/>
48-
<see userInput="{{colorProductAttribute.default_label}}" selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" stepKey="seeProductAttributeTitle"/>
49-
<see selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" userInput="{{colorProductAttribute.default_label}}" stepKey="seeColorAttributeName1"/>
50-
<see userInput="{{colorProductAttribute1.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" stepKey="seeInDropDown1"/>
51-
<see userInput="{{colorProductAttribute2.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" stepKey="seeInDropDown2"/>
52-
<see userInput="{{colorProductAttribute3.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" stepKey="seeInDropDown3"/>
52+
<actionGroup ref="AssertStorefrontProductStockStatusOnProductPageActionGroup" stepKey="seeProductStockStatus">
53+
<argument name="productStockStatus" value="In Stock"/>
54+
</actionGroup>
55+
<actionGroup ref="StorefrontAssertProductPriceOnProductPageActionGroup" stepKey="seeProductPrice">
56+
<argument name="productPrice" value="1.00"/>
57+
</actionGroup>
58+
<actionGroup ref="AssertStorefrontProductAttributeLabelVisibleActionGroup" stepKey="seeProductAttributeTitle">
59+
<argument name="productAttributeLabel" value="{{colorProductAttribute.default_label}}"/>
60+
</actionGroup>
61+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeColorAttributeName1"/>
62+
<actionGroup ref="AssertStorefrontProductAttributeOptionVisibleActionGroup" stepKey="seeInDropDown1">
63+
<argument name="productAttributeOption" value="{{colorProductAttribute1.name}}"/>
64+
</actionGroup>
65+
<actionGroup ref="AssertStorefrontProductAttributeOptionVisibleActionGroup" stepKey="seeInDropDown2">
66+
<argument name="productAttributeOption" value="{{colorProductAttribute2.name}}"/>
67+
</actionGroup>
68+
<actionGroup ref="AssertStorefrontProductAttributeOptionVisibleActionGroup" stepKey="seeInDropDown3">
69+
<argument name="productAttributeOption" value="{{colorProductAttribute3.name}}"/>
70+
</actionGroup>
5371
</test>
5472
</tests>

‎app/design/frontend/Magento/blank/Magento_ProductVideo/web/css/source/_module.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
& when (@media-common = true) {
1111
.fotorama-video-container {
1212
&:after {
13-
background: url(../Magento_ProductVideo/img/gallery-sprite.png) bottom right;
13+
background: url('../Magento_ProductVideo/img/gallery-sprite.png') bottom right;
1414
bottom: 0;
1515
content: '';
1616
height: 100px;
@@ -40,7 +40,7 @@
4040
}
4141

4242
.video-thumb-icon:after {
43-
background: url(../Magento_ProductVideo/img/gallery-sprite.png) bottom left;
43+
background: url('../Magento_ProductVideo/img/gallery-sprite.png') bottom left;
4444
bottom: 0;
4545
content: '';
4646
height: 40px;

‎app/design/frontend/Magento/blank/web/css/source/_sources.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// */
55

66
@import '_variables.less';
7-
@import (reference) '_extends.less';
7+
@import '_extends.less';
88
@import '_typography.less';
99
@import '_layout.less';
1010
@import '_tables.less';

‎app/design/frontend/Magento/blank/web/css/styles-l.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
// ---------------------------------------------
1515

1616
@import '_styles.less';
17-
@import (reference) 'source/_extends.less';
1817

1918
//
2019
// Magento Import instructions

‎app/design/frontend/Magento/blank/web/css/styles-m.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
@import 'source/_reset.less';
1717
@import '_styles.less';
18-
@import (reference) 'source/_extends.less';
1918

2019
//
2120
// Magento Import instructions

‎dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
namespace Magento\Config\Console\Command;
88

99
use Magento\Config\Model\Config\Backend\Admin\Custom;
10+
use Magento\Config\Model\Config\PathValidator;
1011
use Magento\Config\Model\Config\Structure\Converter;
1112
use Magento\Config\Model\Config\Structure\Data as StructureData;
1213
use Magento\Directory\Model\Currency;
@@ -444,6 +445,15 @@ public function configSetValidDataProvider()
444445
];
445446
}
446447

448+
/**
449+
* Test validate path when field has custom config_path
450+
*/
451+
public function testValidatePathWithCustomConfigPath(): void
452+
{
453+
$pathValidator = $this->objectManager->get(PathValidator::class);
454+
$this->assertTrue($pathValidator->validate('general/group/subgroup/second_field'));
455+
}
456+
447457
/**
448458
* Set configuration and check this value from DB with success message this command should display
449459
*

‎dev/tests/integration/testsuite/Magento/Config/_files/system.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
<field id="field" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
1414
<label>Label</label>
1515
</field>
16+
<field id="second_field" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
17+
<label>Label Second</label>
18+
<config_path>custom/config_path/second_field</config_path>
19+
</field>
1620
</group>
1721
</group>
1822
</section>

0 commit comments

Comments
 (0)