Skip to content

Commit cde9bc4

Browse files
chittimachittima
committed
ACP2E-1073 - Test coverage for ACP2E-897
1 parent 2d83bee commit cde9bc4

File tree

3 files changed

+24
-39
lines changed

3 files changed

+24
-39
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckAdminProductGridColumnNameActionGroup.xml renamed to ‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminToggleProductGridColumnByClickingItsNameActionGroup.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
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="CheckAdminProductGridColumnNameActionGroup">
11+
<actionGroup name="AdminToggleProductGridColumnByClickingItsNameActionGroup">
1212
<annotations>
13-
<description>Checks Admin Product Grid 'Columns' name.</description>
13+
<description>Click on 'Columns' name from Columns dropdown menu in Admin Product Grid.</description>
1414
</annotations>
1515
<arguments>
1616
<argument name="optionName" type="string" defaultValue="Name"/>
1717
</arguments>
18-
<click selector="{{AdminProductGridFilterSection.viewColumnOptionName(optionName)}}" stepKey="checkColumn"/>
19-
18+
<click selector="{{AdminProductGridFilterSection.viewColumnOptionName(optionName)}}" stepKey="clickOnTheColumnName"/>
2019
</actionGroup>
2120
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,5 @@
4040
<element name="inputByCodeRangeTo" type="input" selector="input.admin__control-text[name='{{code}}[to]']" parameterized="true"/>
4141
<element name="storeViewOptions" type="text" selector=".admin__data-grid-outer-wrap select[name='store_id'] > option[value='{{value}}']" parameterized="true"/>
4242
<element name="viewColumnOptionName" type="text" selector="//div[contains(@class, '_active')]//div[contains(@class, 'admin__data-grid-action-columns-menu')]//div[@class='admin__field-option']//label[text()='{{col}}']" parameterized="true"/>
43-
4443
</section>
4544
</sections>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridCustomViewColumnDisplayTest.xml

Lines changed: 21 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,57 +10,44 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="AdminProductGridCustomViewColumnDisplayTest">
1212
<annotations>
13-
<stories value="The list of the visible columns didn't save when column position is changed"/>
14-
<title value="The list of the visible columns didn't save for custom view"/>
15-
<description value="Login as Admin, go to Product grid and sort column position, click on Columns dropdown, check/uncheck any column name(not to checkbox)"/>
13+
<stories value="Columns are still visible by clicking on their names in the Columns dropdown menu of product grid in Admin, not only on their respective checkboxes."/>
14+
<title value="Columns are visible by clicking on their names in the Columns dropdown menu of product grid in Admin"/>
15+
<description value="Assert that after rearranging columns order on the product grid in Admin, it will still be possible to toggle the visibility of the columns by clicking on their names in the Columns dropdown menu, and not only on their respective checkboxes."/>
1616
<severity value="AVERAGE"/>
1717
<testCaseId value="AC-6229"/>
1818
<useCaseId value="ACP2E-1073"/>
1919
<group value="catalog"/>
2020
</annotations>
2121
<before>
22-
<!--Create Simple Product and Category -->
23-
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
24-
<createData entity="SimpleProduct" stepKey="createSimpleProduct1">
25-
<requiredEntity createDataKey="createCategory"/>
26-
</createData>
27-
<createData entity="SimpleProduct" stepKey="createSimpleProduct2">
28-
<requiredEntity createDataKey="createCategory"/>
29-
</createData>
22+
<!-- Log in as admin -->
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
3024
</before>
31-
<!-- Log in as admin-->
32-
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25+
<after>
26+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
27+
<actionGroup ref="AdminLogoutActionGroup" stepKey="beginWithLogout"/>
28+
</after>
3329
<!-- Navigate to products list page -->
3430
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
35-
<!--Sort SKU and Name column position -->
31+
<!-- Sort SKU and Name column position -->
3632
<dragAndDrop selector1="{{AdminProductGridSection.columnHeader('SKU')}}" selector2="{{AdminProductGridSection.columnHeader('Name')}}" stepKey="dragAndDropColumnName"/>
37-
<waitForPageLoad stepKey="waitForDragAndDrop"/>
38-
<!--check if price column is visible in grid-->
33+
<!-- Check if price column is visible in grid -->
3934
<seeElement selector="{{AdminProductGridSection.columnHeader('Price')}}" stepKey="seeProductPriceColumn"/>
40-
<!--Click on columns, in dropdown uncheck price -->
41-
<actionGroup ref="ToggleAdminProductGridColumnsDropdownActionGroup" stepKey="openColumnsDropdownPrice"/>
42-
<actionGroup ref="CheckAdminProductGridColumnNameActionGroup" stepKey="hidePriceColumn">
35+
<!-- Click on columns, in dropdown uncheck price -->
36+
<actionGroup ref="ToggleAdminProductGridColumnsDropdownActionGroup" stepKey="openColumnsDropdownMenuToTogglePrice"/>
37+
<actionGroup ref="AdminToggleProductGridColumnByClickingItsNameActionGroup" stepKey="hidePriceColumn">
4338
<argument name="optionName" value="Price"/>
4439
</actionGroup>
45-
<actionGroup ref="ToggleAdminProductGridColumnsDropdownActionGroup" stepKey="closeColumnsDropdownPrice"/>
46-
<!--price column is not visible in product grid-->
40+
<actionGroup ref="ToggleAdminProductGridColumnsDropdownActionGroup" stepKey="closeColumnsDropdownMenuAfterTogglePrice"/>
41+
<!-- Price column is not visible in product grid -->
4742
<dontSeeElement selector="{{AdminProductGridSection.columnHeader('Price')}}" stepKey="dontSeeProductPriceColumn"/>
48-
<!--check weight column is not visible in product grid-->
43+
<!-- check weight column is not visible in product grid -->
4944
<dontSeeElement selector="{{AdminProductGridSection.columnHeader('Weight')}}" stepKey="dontSeeWeightColumn"/>
50-
<!--Click on columns, in dropdown click on column name weight -->
51-
<actionGroup ref="ToggleAdminProductGridColumnsDropdownActionGroup" stepKey="openColumnsDropdownWeight"/>
52-
<actionGroup ref="CheckAdminProductGridColumnNameActionGroup" stepKey="showWeightColumn">
45+
<!-- Click on columns, in dropdown click on column name weight -->
46+
<actionGroup ref="ToggleAdminProductGridColumnsDropdownActionGroup" stepKey="openColumnsDropdownMenuToToggleWeight"/>
47+
<actionGroup ref="AdminToggleProductGridColumnByClickingItsNameActionGroup" stepKey="showWeightColumn">
5348
<argument name="optionName" value="Weight"/>
5449
</actionGroup>
55-
<actionGroup ref="ToggleAdminProductGridColumnsDropdownActionGroup" stepKey="closeColumnsDropdownWeight"/>
50+
<actionGroup ref="ToggleAdminProductGridColumnsDropdownActionGroup" stepKey="closeColumnsDropdownMenuAfterToggleWeight"/>
5651
<seeElement selector="{{AdminProductGridSection.columnHeader('Weight')}}" stepKey="seeWeightColumn"/>
57-
<after>
58-
<deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>
59-
<deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
60-
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
61-
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
62-
<actionGroup ref="AdminLogoutActionGroup" stepKey="beginWithLogout"/>
63-
</after>
64-
6552
</test>
6653
</tests>

0 commit comments

Comments
 (0)