Skip to content

Commit ea57677

Browse files
gabrieldagamagabrieldagama
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop latest changes
Accepted Community Pull Requests: - #31595: [MFTF] Adding AdminClickAddNewPageOnPagesGridActionGroup (by @AnnaAPak) - #31564: Removed CliIndexerReindexActionGroup action group usage for CatalogRule module (by @sergiy-v) - #31452: [MFTF] Adding AdminClearFiltersOnGridActionGroup (by @AnnaAPak) Fixed GitHub Issues: - #31627: [Issue] [MFTF] Adding AdminClickAddNewPageOnPagesGridActionGroup (reported by @m2-assistant[bot]) has been fixed in #31595 by @AnnaAPak in 2.4-develop branch Related commits: 1. 68de5b2 2. ecf2fe5 - #31575: [Issue] Removed CliIndexerReindexActionGroup action group usage for CatalogRule module (reported by @m2-assistant[bot]) has been fixed in #31564 by @sergiy-v in 2.4-develop branch Related commits: 1. 6390bbf - #31632: [Issue] [MFTF] Adding AdminClearFiltersOnGridActionGroup (reported by @m2-assistant[bot]) has been fixed in #31452 by @AnnaAPak in 2.4-develop branch Related commits: 1. 200831e 2. e403ec5 3. 2af6793
2 parents 8631818 + 69bf786 commit ea57677

File tree

46 files changed

+99
-107
lines changed

Some content is hidden

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

46 files changed

+99
-107
lines changed

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminClearGridFiltersActionGroup.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="AdminClearGridFiltersActionGroup">
12+
<annotations>
13+
<description>Click the Clear filters on the grid.</description>
14+
</annotations>
15+
16+
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters"/>
17+
<waitForPageLoad stepKey="waitForPageLoaded"/>
18+
</actionGroup>
19+
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<!-- Verify that the CMS page have the required field name indicator next to Page Title -->
6161
<amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnPagePagesGrid"/>
6262
<waitForPageLoad stepKey="waitForPageLoad1"/>
63-
<click selector="{{CmsPagesPageActionsSection.addNewPageButton}}" stepKey="clickAddNewPage"/>
63+
<actionGroup ref="AdminClickAddNewPageOnPagesGridActionGroup" stepKey="clickAddNewPage"/>
6464
<executeJS function="{{CmsNewPagePageBasicFieldsSection.RequiredFieldIndicator}}" stepKey="pageTitleRequiredFieldIndicator"/>
6565
<assertEquals message="pass" stepKey="assertRequiredFieldIndicator5">
6666
<actualResult type="variable">pageTitleRequiredFieldIndicator</actualResult>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@
7979
<see selector="{{AdminUrlRewriteIndexSection.gridCellByColumnRowNumber('1', 'Request Path')}}" userInput="$$createDefaultCategory.name$$/$$createTwoLevelNestedCategories.name$$/updatedurl.html" stepKey="seeTheRedirectPath"/>
8080

8181
<!-- Verify third level category's old URL path doesn't show redirect path-->
82-
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickOnResetButton1"/>
83-
<waitForPageLoad stepKey="waitForPageToLoad3"/>
82+
<actionGroup ref="AdminClearGridFiltersActionGroup" stepKey="clickOnResetButton1"/>
83+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoad3"/>
8484

8585
<click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters1"/>
8686
<fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="{{Three_nested_categories.name_lwr}}" stepKey="fillOldUrlInRedirectPathFilter"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@
7777
<see selector="{{AdminUrlRewriteIndexSection.gridCellByColumnRowNumber('1', 'Request Path')}}" userInput="$$createDefaultCategory.name$$/$$createTwoLevelNestedCategories.name$$/updateredirecturl.html" stepKey="seeTheRedirectPath"/>
7878

7979
<!-- Verify third level category's Redirect path, Target Path and Redirect type for old URL -->
80-
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickOnResetButton1"/>
81-
<waitForPageLoad stepKey="waitForPageToLoad4"/>
80+
<actionGroup ref="AdminClearGridFiltersActionGroup" stepKey="clickOnResetButton1"/>
81+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoad4"/>
8282
<click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters1"/>
8383
<fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="$$createThreeLevelNestedCategories.name$$" stepKey="fillOldUrlInRedirectPathFilter"/>
8484
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters1"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogPriceRuleByProductAttributeTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,7 @@
154154
<argument name="discountAmount" value="{{SimpleCatalogPriceRule.discount_amount}}"/>
155155
</actionGroup>
156156
<actionGroup ref="AdminCatalogPriceRuleSaveAndApplyActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
157-
<!-- Run cron -->
158-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
159-
<argument name="indices" value="catalogrule_rule"/>
160-
</actionGroup>
157+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
161158
<!-- Open first simple product page on storefront -->
162159
<actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openFirstSimpleProductPage">
163160
<argument name="productUrlKey" value="$createFirstProduct.custom_attributes[url_key]$"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,7 @@
7777

7878
<!-- 3. Save and apply the new catalog price rule -->
7979
<click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApply"/>
80-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
81-
<argument name="indices" value=""/>
82-
</actionGroup>
80+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
8381
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
8482
<argument name="tags" value=""/>
8583
</actionGroup>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleForConfigurableProductWithSpecialPricesTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,7 @@
126126
<!-- Save and apply the new catalog price rule -->
127127
<actionGroup ref="SaveAndApplyCatalogPriceRuleActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
128128

129-
<!-- Reindex and flash cache -->
130-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
131-
<argument name="indices" value=""/>
132-
</actionGroup>
129+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
133130
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
134131
<argument name="tags" value=""/>
135132
</actionGroup>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleByPercentTest.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/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleForCustomerGroupTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,7 @@
4848
<!--<click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApply"/>-->
4949
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="assertSuccess"/>
5050

51-
<!-- Perform reindex and flush cache -->
52-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
53-
<argument name="indices" value=""/>
54-
</actionGroup>
51+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
5552
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
5653
<argument name="tags" value=""/>
5754
</actionGroup>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromConfigurableProductTest.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,7 @@
7171
<requiredEntity createDataKey="createConfigChildProduct2"/>
7272
</createData>
7373

74-
<!-- Perform reindex and flush cache -->
75-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
76-
<argument name="indices" value=""/>
77-
</actionGroup>
74+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
7875
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
7976
<argument name="tags" value=""/>
8077
</actionGroup>
@@ -117,10 +114,7 @@
117114
<waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
118115
<see selector="{{AdminMessagesSection.success}}" userInput="You deleted the rule." stepKey="seeDeletedRuleMessage1"/>
119116

120-
<!-- Reindex -->
121-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
122-
<argument name="indices" value=""/>
123-
</actionGroup>
117+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
124118
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
125119
<argument name="tags" value=""/>
126120
</actionGroup>

0 commit comments

Comments
 (0)