Skip to content

Commit c33d405

Browse files
magento-mts-svcmagento-mts-svc
authored
merge magento/2.4-develop into magento-tsg/2.4-develop-pr73
2 parents d693595 + 9f619bf commit c33d405

File tree

151 files changed

+2175
-775
lines changed

Some content is hidden

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

151 files changed

+2175
-775
lines changed

‎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/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>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616
</annotations>
1717

1818
<click stepKey="clickOnDoneButton" selector="{{AdminProductFormAdvancedInventorySection.doneButton}}"/>
19+
<waitForPageLoad stepKey="waitForProductPageToLoad"/>
1920
</actionGroup>
2021
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
</annotations>
1515

1616
<click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneButton" />
17+
<waitForPageLoad stepKey="waitForCategoryApply"/>
1718
</actionGroup>
1819
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
2020
<fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="{{keyword}}" stepKey="fillKeywordSearchField"/>
2121
<click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearch"/>
22+
<waitForPageLoad stepKey="waitForProductSearch"/>
2223
</actionGroup>
2324
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,6 +1252,20 @@
12521252
<requiredEntity type="product_extension_attribute">EavStock777</requiredEntity>
12531253
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
12541254
</entity>
1255+
<entity name="SimpleProduct_zero" type="product">
1256+
<data key="sku" unique="suffix">testSku</data>
1257+
<data key="type_id">simple</data>
1258+
<data key="attribute_set_id">4</data>
1259+
<data key="visibility">4</data>
1260+
<data key="name" unique="suffix">testProductName</data>
1261+
<data key="price">0.00</data>
1262+
<data key="urlKey" unique="suffix">testurlkey</data>
1263+
<data key="status">1</data>
1264+
<data key="quantity">777</data>
1265+
<data key="weight">1</data>
1266+
<requiredEntity type="product_extension_attribute">EavStock777</requiredEntity>
1267+
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
1268+
</entity>
12551269
<entity name="ApiSimpleOneQty10" type="product2">
12561270
<data key="sku" unique="suffix">api-simple-product</data>
12571271
<data key="type_id">simple</data>

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,11 @@
3232
<waitForPageLoad stepKey="waitForPageLoad" />
3333
<actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
3434
<actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
35+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
36+
<argument name="FolderName" value="Storage Root"/>
37+
</actionGroup>
3538
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
36-
<argument name="ImageFolder" value="ImageFolder"/>
39+
<argument name="ImageFolder" value="ImageFolder"/>
3740
</actionGroup>
3841
<actionGroup ref="AttachImageActionGroup" stepKey="attachImage1">
3942
<argument name="Image" value="ImageUpload3"/>
@@ -44,12 +47,16 @@
4447
</actionGroup>
4548
<actionGroup ref="SaveImageActionGroup" stepKey="insertImage"/>
4649
<actionGroup ref="FillOutUploadImagePopupActionGroup" stepKey="fillOutUploadImagePopup" />
47-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCatalog"/>
50+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCatalog"/>
4851
<amOnPage url="/{{SimpleSubCategory.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
4952
<waitForPageLoad stepKey="waitForPageLoad2"/>
5053
<seeElement selector="{{StorefrontCategoryMainSection.mediaDescription(ImageUpload3.content)}}" stepKey="assertMediaDescription"/>
5154
<seeElementInDOM selector="{{StorefrontCategoryMainSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
5255
<after>
56+
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
57+
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
58+
<argument name="ImageFolder" value="ImageFolder"/>
59+
</actionGroup>
5360
<actionGroup ref="DeleteCategoryActionGroup" stepKey="DeleteCategory">
5461
<argument name="categoryEntity" value="SimpleSubCategory"/>
5562
</actionGroup>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
<!-- Update product Advanced Inventory setting -->
4242
<click stepKey="openSelectedProduct" selector="{{AdminProductGridSection.productRowBySku($$createSimpleProduct.sku$$)}}"/>
4343
<waitForPageLoad stepKey="waitForProductToLoad"/>
44-
<click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickOnAdvancedInventoryLink"/>
45-
<waitForPageLoad stepKey="waitForAdvancedInventoryPageToLoad"/>
44+
<actionGroup ref="AdminClickOnAdvancedInventoryLinkActionGroup" stepKey="clickOnAdvancedInventoryLink"/>
4645
<uncheckOption selector="{{AdminProductFormAdvancedInventorySection.useConfigSettings}}" stepKey="uncheckConfigSetting"/>
4746
<selectOption selector="{{AdminProductFormAdvancedInventorySection.manageStock}}" userInput="Yes" stepKey="clickOnManageStock"/>
4847
<fillField selector="{{AdminProductFormAdvancedInventorySection.advancedInventoryQty}}" userInput="5" stepKey="fillProductQty"/>
@@ -53,9 +52,10 @@
5352
<selectOption selector="{{AdminProductFormAdvancedInventorySection.qtyUsesDecimals}}" userInput="Yes" stepKey="selectQuatityUsesDecimal"/>
5453
<uncheckOption selector="{{AdminProductFormAdvancedInventorySection.notifyBelowQtyConfigSetting}}" stepKey="uncheckNotifyBelowQtyheckBox"/>
5554
<fillField selector="{{AdminProductFormAdvancedInventorySection.notifyBelowQty}}" userInput="1" stepKey="fillNotifyBelowQty"/>
56-
<selectOption selector="{{AdminProductFormAdvancedInventorySection.advancedInventoryStockStatus}}" userInput="In Stock" stepKey="selectOutOfStock"/>
57-
<click stepKey="clickOnDoneButton" selector="{{AdminProductFormAdvancedInventorySection.doneButton}}"/>
58-
<waitForPageLoad stepKey="waitForProductPageToLoad"/>
55+
<actionGroup ref="AdminSetStockStatusConfigActionGroup" stepKey="selectOutOfStock">
56+
<argument name="stockStatus" value="In Stock"/>
57+
</actionGroup>
58+
<actionGroup ref="AdminSubmitAdvancedInventoryFormActionGroup" stepKey="clickOnDoneButton"/>
5959
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickOnSaveButton"/>
6060
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
6161
<!--Clear cache and reindex-->

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
<checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
4040
<checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
4141
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
42-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
43-
<waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
42+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
4443
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
4544
<!-- Verify Parent Category and Sub category is not visible in navigation menu -->
4645
<amOnPage url="$$createCategory.name_lwr$$/{{SimpleSubCategory.name_lwr}}.html" stepKey="openCategoryStoreFrontPage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
<checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
3939
<checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
4040
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
41-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
42-
<waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
41+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
4342
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
4443
<!-- Verify Parent Category and Sub category is not visible in navigation menu -->
4544
<amOnPage url="$$createCategory.name_lwr$$/{{SimpleSubCategory.name_lwr}}.html" stepKey="openCategoryStoreFrontPage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
4040
<checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
4141
<checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
42-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
43-
<waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
42+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
4443
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
4544
<!-- Verify Parent Category and Sub category is not visible in navigation menu -->
4645
<amOnPage url="$$createCategory.name_lwr$$/{{SimpleSubCategory.name_lwr}}.html" stepKey="openCategoryStoreFrontPage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@
119119
<waitForPageLoad stepKey="waitFroPageToLoad2"/>
120120
<see selector="{{AdminProductGridFilterSection.productCount}}" userInput="30" stepKey="seeNumberOfProductsFound"/>
121121
<click selector="{{AdminCategoryProductsGridSection.productSelectAll}}" stepKey="selectSelectAll"/>
122-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
123-
<waitForPageLoad stepKey="waitForCategorySaved"/>
122+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="clickSaveButton"/>
124123
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
125124
<waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
126125
<!--Open Category Store Front Page-->

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@
5757
<fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="$$simpleProduct.name$$" stepKey="selectProduct"/>
5858
<click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
5959
<click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromTableRow"/>
60-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
61-
<waitForPageLoad stepKey="waitForCategorySaved"/>
60+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="clickSaveButton"/>
6261
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
6362
<waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
6463
<!--Verify the Category Title-->

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,36 +40,31 @@
4040
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
4141
<checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
4242
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FirstLevelSubCat.name}}" stepKey="fillFirstSubCategoryName"/>
43-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveFirstSubCategory"/>
44-
<waitForPageLoad stepKey="waitForSFirstSubCategorySaved"/>
43+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveFirstSubCategory"/>
4544
<!-- Verify success message -->
4645
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
4746
<!--Create Nested Second Sub Category-->
4847
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton1"/>
4948
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SecondLevelSubCat.name}}" stepKey="fillSecondSubCategoryName"/>
50-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSecondSubCategory"/>
51-
<waitForPageLoad stepKey="waitForSecondCategory"/>
49+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSecondSubCategory"/>
5250
<!-- Verify success message -->
5351
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage1"/>
5452
<!--Create Nested Third Sub Category/>-->
5553
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton2"/>
5654
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{ThirdLevelSubCat.name}}" stepKey="fillThirdSubCategoryName"/>
57-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveThirdSubCategory"/>
58-
<waitForPageLoad stepKey="waitForThirdCategorySaved"/>
55+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveThirdSubCategory"/>
5956
<!-- Verify success message -->
6057
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage2"/>
6158
<!--Create Nested fourth Sub Category />-->
6259
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton3"/>
6360
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FourthLevelSubCat.name}}" stepKey="fillFourthSubCategoryName"/>
64-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveFourthSubCategory"/>
65-
<waitForPageLoad stepKey="waitForFourthCategorySaved"/>
61+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveFourthSubCategory"/>
6662
<!-- Verify success message -->
6763
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage3"/>
6864
<!--Create Nested fifth Sub Category />-->
6965
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton4"/>
7066
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FifthLevelCat.name}}" stepKey="fillFifthSubCategoryName"/>
71-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveFifthLevelCategory"/>
72-
<waitForPageLoad stepKey="waitForFifthCategorySaved"/>
67+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveFifthLevelCategory"/>
7368
<!-- Verify success message -->
7469
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage4"/>
7570
<amOnPage url="/{{FirstLevelSubCat.name}}/{{SecondLevelSubCat.name}}/{{ThirdLevelSubCat.name}}/{{FourthLevelSubCat.name}}/{{FifthLevelCat.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>

0 commit comments

Comments
 (0)