Skip to content

Commit 2279d2c

Browse files
author
joweecaquicla
committed
magento/adobe-stock-integration#1775: [MFTF] Make AdminAssertCategoryGridPageDetailsActionGroup parametrized - requested changes
1 parent 3c10b69 commit 2279d2c

11 files changed

+94
-48
lines changed

‎app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminSearchCategoryGridPageByCategoryNameActionGroup.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
</arguments>
1818

1919
<conditionalClick selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.clearFilters}}" dependentSelector="{{AdminMediaGalleryCatalogUiCategoryGridSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
20-
<fillField selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.search}}" userInput="{{categoryName}}" stepKey="fillKeywordSearchField"/>
21-
<click selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.submitSearch}}" stepKey="clickKeywordSearch"/>
20+
<fillField selector="{{AdminMediaGalleryCatalogUiCategoryGridSearchSection.searchInput}}" userInput="{{categoryName}}" stepKey="fillKeywordSearchField"/>
21+
<click selector="{{AdminMediaGalleryCatalogUiCategoryGridSearchSection.submitSearch}}" stepKey="clickKeywordSearch"/>
22+
<waitForLoadingMaskToDisappear stepKey="waitingForLoading" />
2223
</actionGroup>
2324
</actionGroups>

‎app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageDetailsActionGroup.xml

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,47 +10,20 @@
1010
<actionGroup name="AssertAdminCategoryGridPageDetailsActionGroup">
1111
<arguments>
1212
<argument name="category"/>
13-
<argument name="imageName" type="string" defaultValue="magento"/>
1413
</arguments>
1514
<annotations>
16-
<description>Assert category grid page basic columns values for a specific category</description>
15+
<description>Assert category grid page name and path column values for a specific category</description>
1716
</annotations>
1817

19-
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.image(imageName)}}" stepKey="assertImageColumn"/>
20-
21-
<!--Name Column-->
2218
<grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Name')}}" stepKey="grabNameColumnValue"/>
2319
<assertEquals stepKey="assertNameColumn">
2420
<expectedResult type="string">$$category.name$$</expectedResult>
2521
<actualResult type="variable">grabNameColumnValue</actualResult>
2622
</assertEquals>
27-
28-
<!--Path Column-->
2923
<grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Path')}}" stepKey="grabPathColumnValue"/>
3024
<assertStringContainsString stepKey="assertPathColumn">
3125
<expectedResult type="string">$$category.name$$</expectedResult>
3226
<actualResult type="variable">grabPathColumnValue</actualResult>
3327
</assertStringContainsString>
34-
35-
<!--Products Column-->
36-
<grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Products')}}" stepKey="grabProductsColumnValue"/>
37-
<assertEquals stepKey="assertProductsColumn">
38-
<expectedResult type="string">0</expectedResult>
39-
<actualResult type="variable">grabProductsColumnValue</actualResult>
40-
</assertEquals>
41-
42-
<!--In Menu Column-->
43-
<grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('In Menu')}}" stepKey="grabInMenuColumnValue"/>
44-
<assertEquals stepKey="assertInMenuColumn">
45-
<expectedResult type="string">Yes</expectedResult>
46-
<actualResult type="variable">grabInMenuColumnValue</actualResult>
47-
</assertEquals>
48-
49-
<!--Enabled Column-->
50-
<grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Enabled')}}" stepKey="grabEnabledColumnValue"/>
51-
<assertEquals stepKey="assertEnabledColumn">
52-
<expectedResult type="string">Yes</expectedResult>
53-
<actualResult type="variable">grabEnabledColumnValue</actualResult>
54-
</assertEquals>
5528
</actionGroup>
5629
</actionGroups>

‎app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageImageColumnActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="AssertAdminCategoryGridPageImageColumnActionGroup">
11+
<arguments>
12+
<argument name="file" type="string" defaultValue="magento"/>
13+
</arguments>
14+
<annotations>
15+
<description>Assert category grid page image column a specific category</description>
16+
</annotations>
17+
18+
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.image(file)}}" stepKey="assertImageColumn"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageNumberOfRecordsActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<description>Assert the number of records in the category grid page.</description>
1616
</annotations>
1717

18-
<grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.recordsLabel}}" stepKey="grabRecordsLabel"/>
18+
<grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSearchSection.numberOfRecordsFound}}" stepKey="grabNumberOfRecordsFound"/>
1919
<assertEquals stepKey="assertStringIsEqual">
2020
<expectedResult type="string">{{numberOfRecords}}</expectedResult>
21-
<actualResult type="variable">grabRecordsLabel</actualResult>
21+
<actualResult type="variable">grabNumberOfRecordsFound</actualResult>
2222
</assertEquals>
2323
</actionGroup>
2424
</actionGroups>

‎app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageProductsInMenuEnabledColumnsActionGroup.xml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
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="AssertAdminCategoryGridPageProductsInMenuEnabledColumnsActionGroup">
11+
<annotations>
12+
<description>Assert category grid page products, in menu, and enabled column values for a specific category</description>
13+
</annotations>
14+
15+
<grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Products')}}" stepKey="grabProductsColumnValue"/>
16+
<assertEquals stepKey="assertProductsColumn">
17+
<expectedResult type="string">0</expectedResult>
18+
<actualResult type="variable">grabProductsColumnValue</actualResult>
19+
</assertEquals>
20+
<grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('In Menu')}}" stepKey="grabInMenuColumnValue"/>
21+
<assertEquals stepKey="assertInMenuColumn">
22+
<expectedResult type="string">Yes</expectedResult>
23+
<actualResult type="variable">grabInMenuColumnValue</actualResult>
24+
</assertEquals>
25+
<grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Enabled')}}" stepKey="grabEnabledColumnValue"/>
26+
<assertEquals stepKey="assertEnabledColumn">
27+
<expectedResult type="string">Yes</expectedResult>
28+
<actualResult type="variable">grabEnabledColumnValue</actualResult>
29+
</assertEquals>
30+
</actionGroup>
31+
</actionGroups>

‎app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Page/AdminMediaGalleryCatalogUiCategoryGridPage.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
-->
88
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
99
<page name="AdminMediaGalleryCatalogUiCategoryGridPage" url="media_gallery_catalog/category/index" area="admin" module="Magento_MediaGalleryCatalogUi">
10+
<section name="AdminMediaGalleryCatalogUiCategoryGridSearchSection"/>
1011
<section name="AdminMediaGalleryCatalogUiCategoryGridSection"/>
1112
</page>
1213
</pages>

‎app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSearchSection.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminMediaGalleryCatalogUiCategoryGridSearchSection">
12+
<element name="searchInput" type="input" selector=".admin__data-grid-header input[placeholder='Search by category name']"/>
13+
<element name="submitSearch" type="button" selector=".data-grid-search-control-wrap > button.action-submit" timeout="30"/>
14+
<element name="numberOfRecordsFound" type="text" selector=".admin__data-grid-header .admin__control-support-text"/>
15+
</section>
16+
</sections>

‎app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,9 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminMediaGalleryCatalogUiCategoryGridSection">
12-
<!--Search by category name element-->
13-
<element name="search" type="input" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] input[placeholder='Search by category name']"/>
14-
<element name="submitSearch" type="button" selector=".data-grid-search-control-wrap > button.action-submit" timeout="30"/>
15-
<!--Records element-->
16-
<element name="recordsLabel" type="text" selector=".admin__data-grid-header .admin__control-support-text"/>
17-
<!--Filter element-->
1812
<element name="clearFilters" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" timeout="30"/>
1913
<element name="activeFilterPlaceholder" type="text" selector="//div[@class='admin__current-filters-list-wrap']//li//span[contains(text(), '{{filterPlaceholder}}')]" parameterized="true"/>
20-
<!--Category Grid Page Columns-->
21-
<element name="image" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Image')]/preceding-sibling::th) +1]//img[contains(@src, '{{imageName}}')]" parameterized="true"/>
14+
<element name="image" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Image')]/preceding-sibling::th) +1]//img[contains(@src, '{{file}}')]" parameterized="true"/>
2215
<element name="columnValue" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{columnName}}')]/preceding-sibling::th) +1 ]//div" parameterized="true"/>
2316
<element name="edit" type="button" selector="//tr[td//text()[contains(., '{{categoryName}}')]]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Action')]/preceding-sibling::th) +1 ]//*[text()='{{actionButton}}']" parameterized="true"/>
2417
</section>

‎app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,17 @@
2626
<deleteData createDataKey="category" stepKey="deleteCategory"/>
2727
</after>
2828
<actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPage"/>
29-
3029
<actionGroup ref="AdminSearchCategoryGridPageByCategoryNameActionGroup" stepKey="searchByCategoryName">
3130
<argument name="categoryName" value="$$category.name$$"/>
3231
</actionGroup>
33-
32+
<actionGroup ref="AssertAdminCategoryGridPageNumberOfRecordsActionGroup" stepKey="assertOneRecordInGrid">
33+
<argument name="numberOfRecords" value="1 records found"/>
34+
</actionGroup>
35+
<actionGroup ref="AssertAdminCategoryGridPageImageColumnActionGroup" stepKey="assertCategoryGridPageImageColumn"/>
3436
<actionGroup ref="AssertAdminCategoryGridPageDetailsActionGroup" stepKey="assertCategoryGridPageRendered">
3537
<argument name="category" value="$$category$$"/>
3638
</actionGroup>
39+
<actionGroup ref="AssertAdminCategoryGridPageProductsInMenuEnabledColumnsActionGroup" stepKey="assertCategoryGridPageProductsInMenuEnabledColumns"/>
40+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
3741
</test>
3842
</tests>

‎app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,13 @@
6060
<actionGroup ref="AssertAdminCategoryGridPageNumberOfRecordsActionGroup" stepKey="assertOneRecordInGrid">
6161
<argument name="numberOfRecords" value="1 records found"/>
6262
</actionGroup>
63+
<actionGroup ref="AssertAdminCategoryGridPageImageColumnActionGroup" stepKey="assertCategoryGridPageImageColumn">
64+
<argument name="file" value="{{UpdatedImageDetails.file}}"/>
65+
</actionGroup>
6366
<actionGroup ref="AssertAdminCategoryGridPageDetailsActionGroup" stepKey="assertCategoryInGrid">
6467
<argument name="category" value="$$category$$"/>
6568
</actionGroup>
69+
<actionGroup ref="AssertAdminCategoryGridPageProductsInMenuEnabledColumnsActionGroup" stepKey="assertCategoryGridPageProductsInMenuEnabledColumns"/>
70+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
6671
</test>
6772
</tests>

0 commit comments

Comments
 (0)