Skip to content

Commit 02dffd9

Browse files
magento-engcom-teammagento-engcom-team
authored
[Magento Community Engineering] Community Contributions - 2.4-develop-prs
 - merged with '2.4-develop-express-lane-prs' branch
2 parents 15e8ab4 + 1968fcf commit 02dffd9

File tree

43 files changed

+466
-91
lines changed

Some content is hidden

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

43 files changed

+466
-91
lines changed

‎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/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</actionGroup>
4848
<actionGroup ref="SaveImageActionGroup" stepKey="insertImage"/>
4949
<actionGroup ref="FillOutUploadImagePopupActionGroup" stepKey="fillOutUploadImagePopup" />
50-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCatalog"/>
50+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCatalog"/>
5151
<amOnPage url="/{{SimpleSubCategory.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
5252
<waitForPageLoad stepKey="waitForPageLoad2"/>
5353
<seeElement selector="{{StorefrontCategoryMainSection.mediaDescription(ImageUpload3.content)}}" stepKey="assertMediaDescription"/>

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

0 commit comments

Comments
 (0)