Skip to content

Commit db7f348

Browse files
tsviklinskyitsviklinskyi
committed
Merge branch '2.4-develop' into MC-34483
# Conflicts: # app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/View.php
2 parents 7f0b4dc + 39012d4 commit db7f348

File tree

3,368 files changed

+1827
-224425
lines changed

Some content is hidden

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

3,368 files changed

+1827
-224425
lines changed

‎.php_cs.dist

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010

1111
$finder = PhpCsFixer\Finder::create()
1212
->name('*.phtml')
13-
->exclude('dev/tests/functional/generated')
14-
->exclude('dev/tests/functional/var')
15-
->exclude('dev/tests/functional/vendor')
1613
->exclude('dev/tests/integration/tmp')
1714
->exclude('dev/tests/integration/var')
1815
->exclude('lib/internal/Cm')

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheCleanActionGroup.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="CliCacheCleanActionGroup">
12+
<annotations>
13+
<description>Run cache:clean by CLI with specified cache tags (space separated).</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="tags" type="string"/>
17+
</arguments>
18+
19+
<magentoCLI command="cache:clean" arguments="{{tags}}" stepKey="cleanSpecifiedCache"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheFlushActionGroup.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="CliCacheFlushActionGroup">
12+
<annotations>
13+
<description>Run cache:flush by CLI with specified cache tags (space separated).</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="tags" type="string"/>
17+
</arguments>
18+
19+
<magentoCLI command="cache:flush" arguments="{{tags}}" stepKey="flushSpecifiedCache"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminLoginSuccessfulTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<group value="login"/>
2121
</annotations>
2222

23+
2324
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2425
<actionGroup ref="AssertAdminSuccessLoginActionGroup" stepKey="assertLoggedIn"/>
2526
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<requiredEntity createDataKey="createBundleOption"/>
3535
<requiredEntity createDataKey="createSimpleProduct"/>
3636
</createData>
37-
<magentoCron stepKey="runCronIndex" groups="index"/>
37+
<magentoCLI stepKey="runCronIndex" command="cron:run --group=index"/>
3838
</before>
3939
<after>
4040
<!-- Delete Simple Product -->
@@ -56,9 +56,11 @@
5656
<actionGroup ref="AdminUpdateProductNameAndDescriptionAttributes" stepKey="updateProductAttribute">
5757
<argument name="product" value="UpdateAttributeNameAndDescription"/>
5858
</actionGroup>
59-
<!--Run cron twice-->
60-
<magentoCLI command="cron:run" stepKey="cronRun"/>
61-
<magentoCLI command="cron:run" stepKey="cronRunTwice"/>
59+
<!-- Start message queue for product attribute consumer -->
60+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
61+
<argument name="consumerName" value="{{AdminProductAttributeUpdateMessageConsumerData.consumerName}}"/>
62+
<argument name="maxMessages" value="{{AdminProductAttributeUpdateMessageConsumerData.messageLimit}}"/>
63+
</actionGroup>
6264
<!-- Search for a product with a new name and Open Product -->
6365
<actionGroup ref="FilterProductGridByNameActionGroup" stepKey="searchWithNewProductName">
6466
<argument name="product" value="UpdateAttributeNameAndDescription"/>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
<waitForPageLoad stepKey="waitForCatalogSubmenu" time="5"/>
2121
<click stepKey="clickOnProducts" selector="{{CatalogSubmenuSection.products}}"/>
2222
<waitForPageLoad stepKey="waitForProductsPage" time="10"/>
23+
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
2324
<click stepKey="TickCheckbox" selector="{{ProductsPageSection.checkboxForProduct(productName)}}"/>
25+
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
2426
<click stepKey="OpenActions" selector="{{ProductsPageSection.actions}}"/>
2527
<waitForAjaxLoad stepKey="waitForDelete" time="5"/>
2628
<click stepKey="ChooseDelete" selector="{{ProductsPageSection.delete}}"/>

‎app/code/Magento/Catalog/Test/Mftf/Data/QueueConsumerData.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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="AdminProductAttributeUpdateConsumerData">
12+
<data key="consumerName">product_action_attribute.update</data>
13+
<data key="messageLimit">100</data>
14+
</entity>
15+
<entity name="AdminProductAttributeWebsiteUpdateConsumerData">
16+
<data key="consumerName">product_action_attribute.website.update</data>
17+
<data key="messageLimit">100</data>
18+
</entity>
19+
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<!--Open Index Management Page and Select Index mode "Update by Schedule" -->
3939
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
4040
<!-- Run cron twice -->
41-
<magentoCLI command="cron:run" stepKey="runCron1"/>
42-
<magentoCLI command="cron:run" stepKey="runCron2"/>
41+
<magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron1"/>
42+
<magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron2"/>
4343
</before>
4444
<after>
4545
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<!--Open Index Management Page and Select Index mode "Update by Schedule" -->
3939
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
4040
<!-- Run cron twice -->
41-
<magentoCLI command="cron:run" stepKey="runCron1"/>
42-
<magentoCLI command="cron:run" stepKey="runCron2"/>
41+
<magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron1"/>
42+
<magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron2"/>
4343
</before>
4444
<after>
4545
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<!--Open Index Management Page and Select Index mode "Update by Schedule" -->
3939
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
4040
<!-- Run cron twice -->
41-
<magentoCLI command="cron:run" stepKey="runCron1"/>
42-
<magentoCLI command="cron:run" stepKey="runCron2"/>
41+
<magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron1"/>
42+
<magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron2"/>
4343
</before>
4444
<after>
4545
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>

0 commit comments

Comments
 (0)