Skip to content

Commit 91d166c

Browse files
sandesh-shivakumarsandesh-shivakumar
committed
ACQE-8247: Move and Update Category on Store View level when Category Flat Indexer is in Update on Schedule mode
- Extended existing action group
1 parent dda9fc2 commit 91d166c

File tree

2 files changed

+20
-50
lines changed

2 files changed

+20
-50
lines changed

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

Lines changed: 7 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="AdminUpdateCategoryDisplaySettingsWithCustomValuesActionGroup">
10+
<actionGroup name="AdminUpdateCategoryDisplaySettingsWithCustomValuesActionGroup"
11+
extends="AdminUpdateCategoryDisplaySettingsActionGroup">
1112
<annotations>
1213
<description>Update Category Display settings with custom values (unchecks Use Config first)</description>
1314
</annotations>
@@ -16,43 +17,12 @@
1617
<argument name="defaultSortingOption" type="string" defaultValue="name"/>
1718
<argument name="priceRange" type="string" defaultValue="5.5"/>
1819
</arguments>
19-
<!-- Select Display Setting and fill the options -->
20-
<scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80"
21-
stepKey="scrollToDisplaySetting"/>
22-
<waitForElementVisible selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}"
23-
stepKey="waitForDisplaySettingTab"/>
24-
<click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
25-
<waitForPageLoad stepKey="waitForDisplaySettingsSectionLoad"/>
26-
<!-- Uncheck Use Config for Available Sort Options and set custom value -->
27-
<waitForElementVisible selector="{{CategoryDisplaySettingsSection.productListCheckBox}}"
28-
stepKey="waitForAvailableSortCheckbox"/>
29-
<uncheckOption selector="{{CategoryDisplaySettingsSection.productListCheckBox}}"
20+
<!-- Override the checkbox behavior to uncheck instead of check -->
21+
<remove keyForRemoval="enableTheAvailableProductList" />
22+
<uncheckOption selector="{{CategoryDisplaySettingsSection.productListCheckBox}}" after="selectDisplaySetting"
3023
stepKey="uncheckUseConfigForAvailableSort"/>
31-
<waitForElementVisible selector="{{CategoryDisplaySettingsSection.productList}}"
32-
stepKey="waitForAvailableSortDropdown"/>
33-
<selectOption selector="{{CategoryDisplaySettingsSection.productList}}"
34-
parameterArray="[{{availableSortOptions}}]" stepKey="selectAvailableSortOptions"/>
35-
<!-- Uncheck Use Config for Default Sort Option and set custom value -->
36-
<scrollTo selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}" x="0" y="-80"
37-
stepKey="scrollToDefaultSortSection"/>
38-
<waitForElementVisible selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}"
39-
stepKey="waitForDefaultSortCheckbox"/>
24+
<remove keyForRemoval="enableTheDefaultProductList" />
4025
<uncheckOption selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}"
41-
stepKey="uncheckUseConfigForDefaultSort"/>
42-
<waitForElementVisible selector="{{CategoryDisplaySettingsSection.defaultProductList}}"
43-
stepKey="waitForDefaultSortDropdown"/>
44-
<selectOption selector="{{CategoryDisplaySettingsSection.defaultProductList}}"
45-
userInput="{{defaultSortingOption}}" stepKey="selectDefaultSortOption"/>
46-
<!-- Uncheck Use Config for Price Range and set custom value -->
47-
<scrollTo selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceCheckBox}}" x="0" y="-80"
48-
stepKey="scrollToPriceRangeSection"/>
49-
<waitForElementVisible selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceCheckBox}}"
50-
stepKey="waitForPriceRangeCheckbox"/>
51-
<uncheckOption selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceCheckBox}}"
52-
stepKey="uncheckUseConfigForPriceRange"/>
53-
<waitForElementVisible selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceInput}}"
54-
stepKey="waitForPriceRangeInput"/>
55-
<fillField selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceInput}}" userInput="{{priceRange}}"
56-
stepKey="fillPriceRange"/>
26+
after="scrollToDefaultProductList" stepKey="uncheckUseConfigForDefaultSort"/>
5727
</actionGroup>
5828
</actionGroups>

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@
5555
</actionGroup>
5656
<actionGroup ref="AddCategoryImageActionGroup" stepKey="addImageToCategoryA"/>
5757
<actionGroup ref="AdminUpdateCategoryDescriptionActionGroup" stepKey="addDescriptionToCategoryA">
58-
<argument name="description" value="Updated CategoryA Description"/>
58+
<argument name="description" value="{{CustomDynamicProductDescription.value}}"/>
5959
</actionGroup>
6060
<actionGroup ref="AdminUpdateCategoryDisplaySettingsWithCustomValuesActionGroup"
6161
stepKey="updateCategoryADisplaySettings">
62-
<argument name="availableSortOptions" value="Product Name"/>
63-
<argument name="defaultSortingOption" value="name"/>
64-
<argument name="priceRange" value="5.5"/>
62+
<argument name="availableSortOptions" value="{{CategoryDisplaySettings.available_sort_by}}"/>
63+
<argument name="defaultSortingOption" value="{{CategoryDisplaySettings.default_sort_by}}"/>
64+
<argument name="priceRange" value="{{CategoryDisplaySettings.filter_price_range}}"/>
6565
</actionGroup>
6666
<actionGroup ref="AdminUpdateCategoryMetaInformationActionGroup" stepKey="addMetaTitleToCategoryA">
6767
<argument name="metaTitle" value="MetaAtitle"/>
@@ -73,13 +73,13 @@
7373
</actionGroup>
7474
<actionGroup ref="AddCategoryImageActionGroup" stepKey="addImageToCategoryC"/>
7575
<actionGroup ref="AdminUpdateCategoryDescriptionActionGroup" stepKey="addDescriptionToCategoryC">
76-
<argument name="description" value="Updated CategoryC Description"/>
76+
<argument name="description" value="{{CustomDynamicProductDescription.value}}"/>
7777
</actionGroup>
7878
<actionGroup ref="AdminUpdateCategoryDisplaySettingsWithCustomValuesActionGroup"
7979
stepKey="updateCategoryCDisplaySettings">
80-
<argument name="availableSortOptions" value="Product Name"/>
81-
<argument name="defaultSortingOption" value="name"/>
82-
<argument name="priceRange" value="5.5"/>
80+
<argument name="availableSortOptions" value="{{CategoryDisplaySettings.available_sort_by}}"/>
81+
<argument name="defaultSortingOption" value="{{CategoryDisplaySettings.default_sort_by}}"/>
82+
<argument name="priceRange" value="{{CategoryDisplaySettings.filter_price_range}}"/>
8383
</actionGroup>
8484
<actionGroup ref="AdminUpdateCategoryMetaInformationActionGroup" stepKey="addMetaTitleToCategoryC">
8585
<argument name="metaTitle" value="MetaCtitle"/>
@@ -117,7 +117,7 @@
117117
<argument name="categoryName" value="$createAnchorCategoryA.name$"/>
118118
</actionGroup>
119119
<actionGroup ref="StorefrontVerifyCategoryContentActionGroup" stepKey="verifyCategoryAInitially">
120-
<argument name="description" value="Updated CategoryA Description"/>
120+
<argument name="description" value="{{CustomDynamicProductDescription.value}}"/>
121121
<argument name="metaTitle" value="MetaAtitle"/>
122122
<argument name="productCount" value="2"/>
123123
</actionGroup>
@@ -126,7 +126,7 @@
126126
<argument name="categoryName" value="$createNonAnchorCategoryC.name$"/>
127127
</actionGroup>
128128
<actionGroup ref="StorefrontVerifyCategoryContentActionGroup" stepKey="verifyCategoryCInitially">
129-
<argument name="description" value="Updated CategoryC Description"/>
129+
<argument name="description" value="{{CustomDynamicProductDescription.value}}"/>
130130
<argument name="metaTitle" value="MetaCtitle"/>
131131
<argument name="productCount" value="1"/>
132132
</actionGroup>
@@ -261,7 +261,7 @@
261261
<argument name="description" value="Другое описание категории А"/>
262262
</actionGroup>
263263
<actionGroup ref="AdminUpdateCategoryMetaInformationActionGroup" stepKey="changeCategoryMetaTitleOnStoreView">
264-
<argument name="metaTitle" value="Meta A Store View"/>
264+
<argument name="metaTitle" value="$createSubCategoryB.name$"/>
265265
</actionGroup>
266266
<actionGroup ref="ChangeSeoUrlKeyForSubCategoryActionGroup" stepKey="changeCategoryUrlKeyOnStoreView">
267267
<argument name="value" value="kategoriya-A"/>
@@ -280,7 +280,7 @@
280280
</actionGroup>
281281
<!-- Verify OLD content (English) - before cron runs -->
282282
<actionGroup ref="StorefrontVerifyCategoryContentActionGroup" stepKey="verifyOldContentOnCategoryAStoreView">
283-
<argument name="description" value="Updated CategoryA Description"/>
283+
<argument name="description" value="{{CustomDynamicProductDescription.value}}"/>
284284
<argument name="metaTitle" value="MetaAtitle"/>
285285
<argument name="productCount" value="1"/>
286286
</actionGroup>
@@ -297,7 +297,7 @@
297297
<!-- Verify NEW content (Russian) - after cron runs -->
298298
<actionGroup ref="StorefrontVerifyCategoryContentActionGroup" stepKey="verifyNewContentOnCategoryAStoreView">
299299
<argument name="description" value="Другое описание категории А"/>
300-
<argument name="metaTitle" value="Meta A Store View"/>
300+
<argument name="metaTitle" value="$createSubCategoryB.name$"/>
301301
<argument name="productCount" value="1"/>
302302
</actionGroup>
303303
</test>

0 commit comments

Comments
 (0)