Skip to content

Commit 519f4ce

Browse files
author
joweecaquicla
committed
magento/adobe-stock-integration#1775: [MFTF] Make AdminAssertCategoryGridPageDetailsActionGroup parametrized - modified ui component and mftf files, additional action group for search by category name on category grid page
1 parent 2ad3c80 commit 519f4ce

File tree

8 files changed

+81
-21
lines changed

8 files changed

+81
-21
lines changed

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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="AdminSearchCategoryGridPageByCategoryNameActionGroup">
12+
<annotations>
13+
<description>Fills 'Search by category name' on Category Grid page. Clicks on Submit Search.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="categoryName"/>
17+
</arguments>
18+
19+
<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"/>
22+
</actionGroup>
23+
</actionGroups>

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

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,40 @@
1717
</annotations>
1818

1919
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.image(imageName)}}" stepKey="assertImageColumn"/>
20-
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.path(category.name)}}" stepKey="assertPathColumn"/>
21-
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.name(category.name)}}" stepKey="assertNameColumn"/>
22-
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.products('0')}}" stepKey="assertProductsColumn"/>
23-
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.inMenu(category.include_in_menu)}}" stepKey="assertInMenuColumn"/>
24-
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.enabled(category.is_active)}}" stepKey="assertEnabledColumn"/>
20+
21+
<!--Name Column-->
22+
<grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Name')}}" stepKey="grabNameColumnValue"/>
23+
<assertEquals stepKey="assertNameColumn">
24+
<expectedResult type="string">$$category.name$$</expectedResult>
25+
<actualResult type="variable">grabNameColumnValue</actualResult>
26+
</assertEquals>
27+
28+
<!--Path Column-->
29+
<grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Path')}}" stepKey="grabPathColumnValue"/>
30+
<assertStringContainsString stepKey="assertPathColumn">
31+
<expectedResult type="string">$$category.name$$</expectedResult>
32+
<actualResult type="variable">grabPathColumnValue</actualResult>
33+
</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>
2555
</actionGroup>
2656
</actionGroups>

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
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+
<!--Active filter element-->
16+
<element name="clearFilters" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" timeout="30"/>
1217
<element name="activeFilterPlaceholder" type="text" selector="//div[@class='admin__current-filters-list-wrap']//li//span[contains(text(), '{{filterPlaceholder}}')]" parameterized="true"/>
18+
<!--Category Grid Page Columns-->
1319
<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="path" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Path')]/preceding-sibling::th) +1 ]//*[contains(text(), '{{categoryName}}')]" parameterized="true"/>
15-
<element name="name" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Name')]/preceding-sibling::th) +1 ]//*[text()='{{categoryName}}']" parameterized="true"/>
16-
<element name="displayMode" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Display Mode')]/preceding-sibling::th) +1 ]//*[text()='{{productsText}}']" parameterized="true"/>
17-
<element name="products" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Products')]/preceding-sibling::th) +1 ]//*[text()='{{productsQty}}']" parameterized="true"/>
18-
<element name="inMenu" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'In Menu')]/preceding-sibling::th) +1 ]//span[contains(@class, '{{inMenuValue}}')]" parameterized="true"/>
19-
<element name="enabled" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Enabled')]/preceding-sibling::th) +1 ]//span[contains(@class, '{{enabledValue}}')]" parameterized="true"/>
20+
<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"/>
2021
<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"/>
2122
</section>
2223
</sections>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
<deleteData createDataKey="category" stepKey="deleteCategory"/>
2727
</after>
2828
<actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPage"/>
29+
30+
<actionGroup ref="AdminSearchCategoryGridPageByCategoryNameActionGroup" stepKey="searchByCategoryName">
31+
<argument name="categoryName" value="$$category.name$$"/>
32+
</actionGroup>
33+
2934
<actionGroup ref="AssertAdminCategoryGridPageDetailsActionGroup" stepKey="assertCategoryGridPageRendered">
3035
<argument name="category" value="$$category$$"/>
3136
</actionGroup>

‎app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/InMenu.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ public function prepareDataSource(array $dataSource)
2424
$fieldName = $this->getData('name');
2525
foreach ($dataSource['data']['items'] as & $item) {
2626
if (isset($item[$fieldName]) && $item[$fieldName] == 1) {
27-
$item[$fieldName] = '<span class="1">Yes</span>';
27+
$item[$fieldName] = 'Yes';
2828
} else {
29-
$item[$fieldName] = '<span class="0">No</span>';
29+
$item[$fieldName] = 'No';
3030
}
3131
}
3232
}

‎app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/IsActive.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ public function prepareDataSource(array $dataSource)
2424
$fieldName = $this->getData('name');
2525
foreach ($dataSource['data']['items'] as & $item) {
2626
if (isset($item[$fieldName]) && $item[$fieldName] == 1) {
27-
$item[$fieldName] = '<span class="1">Yes</span>';
27+
$item[$fieldName] = 'Yes';
2828
} else {
29-
$item[$fieldName] = '<span class="0">No</span>';
29+
$item[$fieldName] = 'No';
3030
}
3131
}
3232
}

‎app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_category_listing.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,11 @@
170170
<column name="include_in_menu" class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns\InMenu">
171171
<settings>
172172
<label translate="true">In Menu</label>
173-
<bodyTmpl>ui/grid/cells/html</bodyTmpl>
174173
</settings>
175174
</column>
176175
<column name="is_active" class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns\IsActive">
177176
<settings>
178177
<label translate="true">Enabled</label>
179-
<bodyTmpl>ui/grid/cells/html</bodyTmpl>
180178
</settings>
181179
</column>
182180
<actionsColumn name="actions" class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns\CategoryActions" sortOrder="1000">

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyAssetFilterTest.xml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,19 @@
6565
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
6666
<actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryGridPage"/>
6767

68+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="firstResetAdminDataGridToDefaultView"/>
6869
<actionGroup ref="AdminEnhancedMediaGalleryCategoryGridExpandFilterActionGroup" stepKey="expandFilters"/>
6970
<actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
7071
<argument name="filterName" value="Asset"/>
7172
<argument name="optionName" value="{{ImageMetadata.title}}"/>
7273
</actionGroup>
7374
<actionGroup ref="AdminEnhancedMediaGalleryCategoryGridApplyFiltersActionGroup" stepKey="applyFilters"/>
7475

75-
<actionGroup ref="AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup" stepKey="assertCategoryInGrid">
76-
<argument name="categoryName" value="$$category.name$$"/>
77-
</actionGroup>
78-
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
76+
<grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Name')}}" stepKey="grabCategoryNameFromGrid"/>
77+
<assertEquals stepKey="assertEqualCategoryName">
78+
<expectedResult type="string">$$category.name$$</expectedResult>
79+
<actualResult type="variable">grabCategoryNameFromGrid</actualResult>
80+
</assertEquals>
81+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
7982
</test>
8083
</tests>

0 commit comments

Comments
 (0)