Skip to content

Commit 3286bf9

Browse files
Feedback changes
1 parent f0d4a6d commit 3286bf9

File tree

8 files changed

+46
-23
lines changed

8 files changed

+46
-23
lines changed

app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml renamed to app/code/Magento/Backup/Test/Mftf/ActionGroup/AdminBackupDeleteActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="DeleteBackup">
11+
<actionGroup name="AdminBackupDeleteActionGroup">
1212
<annotations>
1313
<description>Deletes a Backup using provided Backup Entity.</description>
1414
</annotations>
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
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="deleteBackup" extends="DeleteBackupActionGroup" deprecated="Use DeleteBackupActionGroup"/>
12+
</actionGroups>

app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@
3939
<actionGroup ref="CreateDatabaseBackupActionGroup" stepKey="createDatabaseBackup"/>
4040

4141
<!--Delete system backup-->
42-
<actionGroup ref="DeleteBackup" stepKey="deleteSystemBackup">
42+
<actionGroup ref="AdminBackupDeleteActionGroup" stepKey="deleteSystemBackup">
4343
<argument name="backup" value="SystemBackup"/>
4444
</actionGroup>
4545

4646
<!--Delete database/media backup-->
47-
<actionGroup ref="DeleteBackup" stepKey="deleteMediaBackup">
47+
<actionGroup ref="AdminBackupDeleteActionGroup" stepKey="deleteMediaBackup">
4848
<argument name="backup" value="MediaBackup"/>
4949
</actionGroup>
5050

5151
<!--Delete database backup-->
52-
<actionGroup ref="DeleteBackup" stepKey="deleteDatabaseBackup">
52+
<actionGroup ref="AdminBackupDeleteActionGroup" stepKey="deleteDatabaseBackup">
5353
<argument name="backup" value="DatabaseBackup"/>
5454
</actionGroup>
5555

app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3131
<deleteData createDataKey="categoryFirst" stepKey="deleteCategory"/>
3232
<comment userInput="The test was moved to elasticsearch suite" stepKey="resetCatalogSearchConfiguration"/>
33-
<actionGroup ref="UpdateIndexerOnSave" stepKey="resetIndexerBackToOriginalState">
33+
<actionGroup ref="AdminIndexerSetUpdateOnSave" stepKey="resetIndexerBackToOriginalState">
3434
<argument name="indexerName" value="catalogsearch_fulltext"/>
3535
</actionGroup>
3636
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminIndexerSetUpdateOnSave">
11+
<annotations>
12+
<description>Goes to the Index Management page. Checks the provided Indexer Name. Selects 'Update on Save'. Clicks on Submit.</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="indexerName" type="string"/>
16+
</arguments>
17+
18+
<amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/indexer/indexer/list/" stepKey="amOnIndexManagementPage2"/>
19+
<waitForPageLoad stepKey="waitForIndexManagementPageToLoad2"/>
20+
<click selector="{{AdminIndexManagementSection.indexerCheckbox(indexerName)}}" stepKey="selectIndexer2"/>
21+
<selectOption selector="{{AdminIndexManagementSection.massActionSelect}}" userInput="change_mode_onthefly" stepKey="selectUpdateOnSave"/>
22+
<click selector="{{AdminIndexManagementSection.massActionSubmit}}" stepKey="submitIndexerForm2"/>
23+
<!-- No re-indexing is done as part of this actionGroup since the test required no re-indexing -->
24+
<waitForPageLoad stepKey="waitForSave2"/>
25+
</actionGroup>
26+
</actionGroups>

app/code/Magento/Indexer/Test/Mftf/ActionGroup/IndexerActionGroup/UpdateIndexerOnSaveActionGroup.xml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,5 @@
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="UpdateIndexerOnSave">
11-
<annotations>
12-
<description>Goes to the Index Management page. Checks the provided Indexer Name. Selects 'Update on Save'. Clicks on Submit.</description>
13-
</annotations>
14-
<arguments>
15-
<argument name="indexerName" type="string"/>
16-
</arguments>
17-
18-
<amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/indexer/indexer/list/" stepKey="amOnIndexManagementPage2"/>
19-
<waitForPageLoad stepKey="waitForIndexManagementPageToLoad2"/>
20-
<click selector="{{AdminIndexManagementSection.indexerCheckbox(indexerName)}}" stepKey="selectIndexer2"/>
21-
<selectOption selector="{{AdminIndexManagementSection.massActionSelect}}" userInput="change_mode_onthefly" stepKey="selectUpdateOnSave"/>
22-
<click selector="{{AdminIndexManagementSection.massActionSubmit}}" stepKey="submitIndexerForm2"/>
23-
<!-- No re-indexing is done as part of this actionGroup since the test required no re-indexing -->
24-
<waitForPageLoad stepKey="waitForSave2"/>
25-
</actionGroup>
10+
<actionGroup name="updateIndexerOnSave" extends="AdminIndexerSetUpdateOnSaveActionGroup" deprecated="Use AdminIndexerSetUpdateOnSaveActionGroup"/>
2611
</actionGroups>

app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreGroupTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<waitForPageLoad stepKey="waitForBackupIndexPageLoad"/>
4949
<see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{WebSetupWizardBackup.name}}" stepKey="seeBackupInGrid"/>
5050
<!--Delete database backup-->
51-
<actionGroup ref="DeleteBackup" stepKey="deleteDatabaseBackup">
51+
<actionGroup ref="AdminBackupDeleteActionGroup" stepKey="deleteDatabaseBackup">
5252
<argument name="backup" value="WebSetupWizardBackup"/>
5353
</actionGroup>
5454
</test>

app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreViewTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<waitForPageLoad stepKey="waitForBackupIndexPageLoad"/>
4747
<see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{WebSetupWizardBackup.name}}" stepKey="seeBackupInGrid"/>
4848
<!--Delete database backup-->
49-
<actionGroup ref="DeleteBackup" stepKey="deleteDatabaseBackup">
49+
<actionGroup ref="AdminBackupDeleteActionGroup" stepKey="deleteDatabaseBackup">
5050
<argument name="backup" value="WebSetupWizardBackup"/>
5151
</actionGroup>
5252

0 commit comments

Comments
 (0)