Skip to content

Commit ce0f437

Browse files
slavvkaslavvka
authored
ENGCOM-7421: #27503 : MFTF: Acceptance tests break the naming convention (Indexer + Backup) #27515 
2 parents 5dd3acf + b11dd5a commit ce0f437

12 files changed

+66
-31
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>

‎app/code/Magento/Backup/Test/Mftf/ActionGroup/AdminBackupIndexPageOpenActionGroup.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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="AdminBackupIndexPageOpenActionGroup">
11+
<amOnPage url="{{AdminBackupIndexPage.url}}" stepKey="navigateToBackupIndexPage"/>
12+
<waitForPageLoad stepKey="waitForBackupIndexPageLoad"/>
13+
</actionGroup>
14+
</actionGroups>

‎app/code/Magento/Backup/Test/Mftf/ActionGroup/deleteBackupActionGroup.xml

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="AdminBackupDeleteActionGroup" deprecated="Use DeleteBackupActionGroup"/>
12+
</actionGroups>

‎app/code/Magento/Backup/Test/Mftf/Page/BackupIndexPage.xml renamed to ‎app/code/Magento/Backup/Test/Mftf/Page/AdminBackupIndexPage.xml

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

99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
11-
<page name="BackupIndexPage" url="/backup/index/" area="admin" module="Magento_Backup">
11+
<page name="AdminBackupIndexPage" url="/backup/index/" area="admin" module="Magento_Backup">
1212
<section name="AdminMainActionsSection"/>
1313
<section name="AdminGridTableSection"/>
1414
<section name="AdminCreateBackupFormSection"/>

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2727

2828
<!--Go to backup index page-->
29-
<amOnPage url="{{BackupIndexPage.url}}" stepKey="goToBackupPage"/>
30-
<waitForPageLoad stepKey="waitForBackupPage"/>
29+
<actionGroup ref="AdminBackupIndexPageOpenActionGroup" stepKey="navigateToBackupPage"/>
3130

3231
<!--Create system backup-->
3332
<actionGroup ref="CreateSystemBackupActionGroup" stepKey="createSystemBackup"/>
@@ -39,17 +38,17 @@
3938
<actionGroup ref="CreateDatabaseBackupActionGroup" stepKey="createDatabaseBackup"/>
4039

4140
<!--Delete system backup-->
42-
<actionGroup ref="deleteBackup" stepKey="deleteSystemBackup">
41+
<actionGroup ref="AdminBackupDeleteActionGroup" stepKey="deleteSystemBackup">
4342
<argument name="backup" value="SystemBackup"/>
4443
</actionGroup>
4544

4645
<!--Delete database/media backup-->
47-
<actionGroup ref="deleteBackup" stepKey="deleteMediaBackup">
46+
<actionGroup ref="AdminBackupDeleteActionGroup" stepKey="deleteMediaBackup">
4847
<argument name="backup" value="MediaBackup"/>
4948
</actionGroup>
5049

5150
<!--Delete database backup-->
52-
<actionGroup ref="deleteBackup" stepKey="deleteDatabaseBackup">
51+
<actionGroup ref="AdminBackupDeleteActionGroup" stepKey="deleteDatabaseBackup">
5352
<argument name="backup" value="DatabaseBackup"/>
5453
</actionGroup>
5554

‎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="AdminIndexerSetUpdateOnSaveActionGroup" stepKey="resetIndexerBackToOriginalState">
3434
<argument name="indexerName" value="catalogsearch_fulltext"/>
3535
</actionGroup>
3636
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>

‎app/code/Magento/Indexer/Test/Mftf/ActionGroup/IndexerActionGroup/AdminIndexerSetUpdateOnSaveActionGroup.xml

Lines changed: 26 additions & 0 deletions
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="AdminIndexerSetUpdateOnSaveActionGroup">
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/UpdateIndexerByScheduleActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
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="updateIndexerBySchedule">
10+
<actionGroup name="UpdateIndexerBySchedule">
1111
<annotations>
1212
<description>Goes to the Index Management page. Checks the provided Indexer Name. Selects 'Update by Schedule'. Clicks on Submit.</description>
1313
</annotations>

‎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/Indexer/Test/Mftf/Test/AdminSystemIndexManagementGridChangesTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<stories value="Menu Navigation"/>
1414
<title value="Admin system index management grid change test"/>
1515
<description value="Verify changes in 'Schedule column' on system index management"/>
16+
<severity value="CRITICAL"/>
1617
</annotations>
1718
<before>
1819
<createData entity="_defaultCategory" stepKey="createCategory"/>

0 commit comments

Comments
 (0)