Skip to content

Commit ba07e75

Browse files
okolesnykokolesnyk
committed
Add testCaseId to test annotation
- issue magento/magento-functional-tests-migration/623 - pull request magento/magento-functional-tests-migration/703 - test fixes
1 parent e1e8bda commit ba07e75

13 files changed

+117
-41
lines changed

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCMSPageMassActionDisableActionGroup.xml renamed to ‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCMSPageMassActionSelectActionGroup.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@
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="AdminCMSPageMassActionDisableActionGroup">
10+
<actionGroup name="AdminCMSPageMassActionSelectActionGroup">
11+
<arguments>
12+
<argument name="action" type="string" />
13+
</arguments>
1114
<click selector="{{CmsPagesPageActionsSection.massActionsButton}}" stepKey="clickMassActionDropdown"/>
12-
<click selector="{{CmsPagesPageActionsSection.massActionsOption('Disable')}}" stepKey="clickDisableAction"/>
15+
<click selector="{{CmsPagesPageActionsSection.massActionsOption(action)}}" stepKey="clickAction"/>
1316
<waitForPageLoad stepKey="waitForPageToReload"/>
1417
</actionGroup>
15-
</actionGroups>
18+
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCMSPagesGridActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
<amOnPage url="{{CmsPagesPage.url}}" stepKey="navigateToCMSPagesGrid"/>
1212
<waitForPageLoad stepKey="waitForPageLoad"/>
1313
</actionGroup>
14-
</actionGroups>
14+
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSPageInGridActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
</arguments>
1414
<checkOption selector="{{CmsPagesPageActionsSection.pageRowCheckboxByIdentifier(identifier)}}" stepKey="selectCmsPageInGrid"/>
1515
</actionGroup>
16-
</actionGroups>
16+
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageInGridActionGroup.xml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,12 @@
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="AssertCMSPageInGrid">
10+
<actionGroup name="AssertCMSPageInGridActionGroup">
1111
<arguments>
12-
<argument name="identifier" defaultValue=""/>
12+
<argument name="cmsPage" type="entity" />
1313
</arguments>
14-
<amOnPage url="{{CmsPagesPage.url}}" stepKey="navigateToCMSPagesGrid"/>
15-
<waitForPageLoad stepKey="waitForPageLoad1"/>
16-
<conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
17-
<waitForPageLoad stepKey="waitForPageLoad2"/>
18-
<conditionalClick selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="clickToAttemptSortByIdDescending" visible="true"/>
19-
<waitForLoadingMaskToDisappear stepKey="waitForFirstIdSortDescendingToFinish" />
20-
<!-- Conditional Click again in case it goes from default state to ascending on first click -->
21-
<conditionalClick selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="secondClickToAttemptSortByIdDescending" visible="true"/>
22-
<waitForLoadingMaskToDisappear stepKey="waitForSecondIdSortDescendingToFinish" />
23-
<click selector="{{CmsPagesPageActionsSection.select(identifier)}}" stepKey="clickSelectCMSPage" />
14+
15+
<seeElement stepKey="seeElementByCmsPageIdentifier" selector="{{AdminDataGridTableSection.rowTemplateStrict(cmsPage.identifier)}}" />
16+
<see userInput="{{cmsPage.title}}" stepKey="seeCmsPageTitle" selector="{{AdminDataGridTableSection.rowTemplateStrict(cmsPage.identifier)}}" />
2417
</actionGroup>
2518
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageNotFoundOnStorefrontActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
<actionGroup name="AssertCMSPageNotFoundOnStorefrontActionGroup">
1111
<see userInput="Whoops, our bad..." stepKey="seePageErrorNotFound"/>
1212
</actionGroup>
13-
</actionGroups>
13+
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/StorefrontGoToCMSPageActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<arguments>
1212
<argument name="identifier" type="string"/>
1313
</arguments>
14-
<amOnPage url="{{StorefrontHomePage.url}}/{{identifier}}" stepKey="amOnCmsPageOnStorefront"/>
14+
<amOnPage url="{{StorefrontHomePage.url}}{{identifier}}" stepKey="amOnCmsPageOnStorefront"/>
1515
<waitForPageLoad stepKey="waitForPageLoadOnStorefront"/>
1616
</actionGroup>
1717
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
<element name="savePageSuccessMessage" type="text" selector=".message-success"/>
2828
<element name="delete" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Delete']" parameterized="true"/>
2929
<element name="deleteConfirm" type="button" selector=".action-primary.action-accept" timeout="60"/>
30-
<element name="pageRowCheckboxByIdentifier" type="block" selector="//div[@data-bind=&quot;scope: 'cms_page_listing.cms_page_listing'&quot;]//td[count(../../..//th[./*[.='URL Key']]/preceding-sibling::th) + 1][./*[.='{{identifier}}']]/../td//input[@data-action='select-row']" parameterized="true" />
31-
<element name="massActionsButton" type="button" selector="div.admin__data-grid-header-row.row div.action-select-wrap button.action-select"/>
32-
<element name="massActionsOption" type="button" selector="//div[contains(@class,'admin__data-grid-header-row') and contains(@class, 'row')]//div[contains(@class, 'action-select-wrap')]//ul/li/span[text() = '{{label}}']" parameterized="true"/>
30+
<element name="pageRowCheckboxByIdentifier" type="checkbox" selector="//table[@data-role='grid']//td[count(../../..//th[./*[.='URL Key']]/preceding-sibling::th) + 1][./*[.='{{identifier}}']]/../td//input[@data-action='select-row']" parameterized="true" />
31+
<element name="massActionsButton" type="button" selector="//div[@class='admin__data-grid-header'][(not(ancestor::*[@class='sticky-header']) and not(contains(@style,'visibility: hidden'))) or (ancestor::*[@class='sticky-header' and not(contains(@style,'display: none'))])]//*[contains(@class, 'row-gutter')]//button[contains(@class, 'action-select')]" />
32+
<element name="massActionsOption" type="button" selector="//div[@class='admin__data-grid-header'][(not(ancestor::*[@class='sticky-header']) and not(contains(@style,'visibility: hidden'))) or (ancestor::*[@class='sticky-header' and not(contains(@style,'display: none'))])]//span[contains(@class, 'action-menu-item') and .= '{{action}}']" parameterized="true"/>
3333
</section>
3434
</sections>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageMassActionTest.xml

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1010
<test name="AdminCmsPageMassActionTest">
1111
<annotations>
12-
<features value="Cms"/>
12+
<features value="CmsPage"/>
1313
<title value="Create two CMS Pages and perform mass disable action"/>
1414
<description value="Admin should be able to perform mass actions to CMS pages"/>
15+
<stories value="Admin Grid Mass Action" />
16+
<testCaseId value="MC-14659" />
17+
<severity value="CRITICAL"/>
1518
<group value="backend"/>
16-
<group value="cMSContent"/>
19+
<group value="CMSContent"/>
1720
<group value="mtf_migrated"/>
1821
</annotations>
1922
<before>
@@ -26,36 +29,57 @@
2629
<deleteData createDataKey="secondCMSPage" stepKey="deleteSecondCMSPage" />
2730
<actionGroup ref="logout" stepKey="logout"/>
2831
</after>
32+
2933
<!--Go to Grid page-->
3034
<actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="navigateToCMSPageGrid"/>
35+
<actionGroup ref="AdminGridFilterResetActionGroup" stepKey="clearPossibleGridFilters"/>
36+
3137
<!--Select pages in Grid-->
3238
<actionGroup ref="AdminSelectCMSPageInGridActionGroup" stepKey="selectFirstCMSPage">
3339
<argument name="identifier" value="$$firstCMSPage.identifier$$"/>
3440
</actionGroup>
3541
<actionGroup ref="AdminSelectCMSPageInGridActionGroup" stepKey="selectSecondCMSPage">
3642
<argument name="identifier" value="$$secondCMSPage.identifier$$"/>
3743
</actionGroup>
44+
3845
<!-- Disable Pages-->
39-
<actionGroup ref="AdminCMSPageMassActionDisableActionGroup" stepKey="disablePages"/>
46+
<actionGroup ref="AdminCMSPageMassActionSelectActionGroup" stepKey="disablePages">
47+
<argument name="action" value="Disable" />
48+
</actionGroup>
49+
50+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
51+
<argument name="message" value="A total of 2 record(s) have been disabled." />
52+
</actionGroup>
53+
4054
<!--Verify pages in Grid-->
41-
<actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="openCMSPagesGridActionGroup"/>
42-
<actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilters"/>
43-
<actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortGridByIdDescending"/>
44-
<actionGroup ref="AdminSelectCMSPageFromGridActionGroup" stepKey="verifyFirstPageInGrid">
45-
<argument name="identifier" value="$$firstCMSPage.identifier$$"/>
55+
<actionGroup ref="AdminGridFilterResetActionGroup" stepKey="clearGridFilters"/>
56+
<actionGroup ref="AdminGridFilterFillInputFieldActionGroup" stepKey="filterGridByFirstCmsPageIdentifier">
57+
<argument name="filterInputName" value="identifier" />
58+
<argument name="filterValue" value="$$firstCMSPage.identifier$$" />
4659
</actionGroup>
47-
<actionGroup ref="AdminSelectCMSPageFromGridActionGroup" stepKey="verifySecondPageInGrid">
48-
<argument name="identifier" value="$$secondCMSPage.identifier$$"/>
60+
<actionGroup ref="AdminGridFilterApplyActionGroup" stepKey="applyFirstGridFilters"/>
61+
<actionGroup ref="AssertCMSPageInGridActionGroup" stepKey="assertFirstCmsPageInGrid">
62+
<argument name="cmsPage" value="$$firstCMSPage$$" />
63+
</actionGroup>
64+
65+
<actionGroup ref="AdminGridFilterFillInputFieldActionGroup" stepKey="filterGridBySecondCmsPageIdentifier">
66+
<argument name="filterInputName" value="identifier" />
67+
<argument name="filterValue" value="$$secondCMSPage.identifier$$" />
68+
</actionGroup>
69+
<actionGroup ref="AdminGridFilterApplyActionGroup" stepKey="applySecondGridFilters"/>
70+
<actionGroup ref="AssertCMSPageInGridActionGroup" stepKey="assertSecondCmsPageInGrid">
71+
<argument name="cmsPage" value="$$secondCMSPage$$" />
4972
</actionGroup>
50-
<!--Verify first page is disabled on Frontend-->
73+
<actionGroup ref="AdminGridFilterResetActionGroup" stepKey="clearGridFiltersToIsolateTest"/>
74+
75+
<!--Verify pages are disabled on Storefront-->
5176
<actionGroup ref="StorefrontGoToCMSPageActionGroup" stepKey="goToFirstCMSPageOnStorefront">
5277
<argument name="identifier" value="$$firstCMSPage.identifier$$"/>
5378
</actionGroup>
5479
<actionGroup ref="AssertCMSPageNotFoundOnStorefrontActionGroup" stepKey="seeNotFoundErrorForFirstPage"/>
55-
<!--Verify second page is disabled on Frontend-->
5680
<actionGroup ref="StorefrontGoToCMSPageActionGroup" stepKey="goToSecondCMSPageOnStorefront">
5781
<argument name="identifier" value="$$secondCMSPage.identifier$$"/>
5882
</actionGroup>
5983
<actionGroup ref="AssertCMSPageNotFoundOnStorefrontActionGroup" stepKey="seeNotFoundErrorForSecondPage"/>
6084
</test>
61-
</tests>
85+
</tests>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSPageFromGridActionGroup.xml renamed to ‎app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterApplyActionGroup.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8+
89
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
910
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="AdminSelectCMSPageFromGridActionGroup">
11-
<arguments>
12-
<argument name="identifier" defaultValue=""/>
13-
</arguments>
14-
<click selector="{{CmsPagesPageActionsSection.select(identifier)}}" stepKey="clickSelectCMSPage" />
11+
<actionGroup name="AdminGridFilterApplyActionGroup">
12+
<click selector="{{AdminDataGridFilterSection.apply}}" stepKey="applyFilters" />
13+
<waitForPageLoad stepKey="waitForFiltersReset" />
1514
</actionGroup>
16-
</actionGroups>
15+
</actionGroups>

‎app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterFillInputFieldActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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="AdminGridFilterFillInputFieldActionGroup">
12+
<arguments>
13+
<argument name="filterInputName" type="string"/>
14+
<argument name="filterValue" type="string"/>
15+
</arguments>
16+
17+
<conditionalClick selector="{{AdminDataGridFilterSection.filterExpand}}" dependentSelector="{{AdminDataGridFilterSection.filterForm}}" visible="false" stepKey="openFiltersFormIfNecessary" />
18+
<waitForElementVisible selector="{{AdminDataGridFilterSection.filterForm}}" stepKey="waitForFormVisible" />
19+
<fillField userInput="{{filterValue}}" selector="{{AdminDataGridFilterSection.inputFieldByNameAttr(filterInputName)}}" stepKey="fillFilterInputField" />
20+
</actionGroup>
21+
</actionGroups>

0 commit comments

Comments
 (0)