Skip to content

Commit b227a1b

Browse files
sidolovsidolov
authored
ENGCOM-8545: Removed redundant header issue in grid cells while adding grouped product items after changing attribute set #31142 
2 parents f6464ea + 5e89c84 commit b227a1b

File tree

4 files changed

+98
-1
lines changed

4 files changed

+98
-1
lines changed

‎app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminAssertProductOnGroupedOptionGridActionGroup.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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminAssertProductOnGroupedOptionGridActionGroup">
12+
<annotations>
13+
<description>Admin assert product on grouped option grid.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="product"/>
17+
</arguments>
18+
19+
<grabTextFrom selector="{{AdminGroupedProductOptionGridSection.productName}}" stepKey="grabProductName"/>
20+
<assertEquals stepKey="assertProductName">
21+
<expectedResult type="string">{{product.name}}</expectedResult>
22+
<actualResult type="variable">$grabProductName</actualResult>
23+
</assertEquals>
24+
25+
<grabTextFrom selector="{{AdminGroupedProductOptionGridSection.productSku}}" stepKey="grabProductSku"/>
26+
<assertEquals stepKey="assertProductSku">
27+
<expectedResult type="string">{{product.sku}}</expectedResult>
28+
<actualResult type="variable">$grabProductSku</actualResult>
29+
</assertEquals>
30+
</actionGroup>
31+
</actionGroups>

‎app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminGroupedProductOptionGridSection.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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="AdminGroupedProductOptionGridSection">
12+
<element name="productName" type="text" selector=".data-row td[data-index='name']"/>
13+
<element name="productSku" type="text" selector=".data-row td[data-index='sku']"/>
14+
</section>
15+
</sections>

‎app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminCreateGroupedProductNonDefaultAttributeSetTest.xml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminCreateGroupedProductNonDefaultAttributeSetTest">
11+
<annotations>
12+
<features value="GroupedProduct"/>
13+
<stories value="Create product"/>
14+
<title value="Create Grouped Product when non-default attribute set is chosen"/>
15+
<description value="Create Grouped Product with simple when non-default attribute set is chosen"/>
16+
<testCaseId value="MC-39950"/>
17+
<severity value="MAJOR"/>
18+
<group value="groupedProduct"/>
19+
</annotations>
20+
<before>
21+
<createData entity="ApiProductWithDescription" stepKey="createSimpleProduct"/>
22+
<createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
24+
</before>
25+
<after>
26+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
27+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteFirstProduct"/>
28+
<deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
29+
</after>
30+
31+
<actionGroup ref="GoToSpecifiedCreateProductPageActionGroup" stepKey="createGroupedProduct">
32+
<argument name="productType" value="grouped"/>
33+
</actionGroup>
34+
<actionGroup ref="AdminProductPageSelectAttributeSetActionGroup" stepKey="selectAttributeSet">
35+
<argument name="attributeSetName" value="$createAttributeSet.attribute_set_name$"/>
36+
</actionGroup>
37+
<actionGroup ref="FillGroupedProductFormActionGroup" stepKey="fillProductForm">
38+
<argument name="product" value="GroupedProduct"/>
39+
</actionGroup>
40+
<actionGroup ref="AdminAssignProductToGroupActionGroup" stepKey="addSimpleToGroup">
41+
<argument name="product" value="$$createSimpleProduct$$"/>
42+
</actionGroup>
43+
<actionGroup ref="AdminAssertProductOnGroupedOptionGridActionGroup" stepKey="assertProductOptionGrid">
44+
<argument name="product" value="$$createSimpleProduct$$"/>
45+
</actionGroup>
46+
</test>
47+
</tests>

‎app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/Grouped.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,7 @@ protected function fillMeta()
562562
'fit' => true,
563563
'label' => __('Thumbnail'),
564564
'sortOrder' => 20,
565+
'labelVisible' => false,
565566
],
566567
],
567568
],
@@ -586,6 +587,7 @@ protected function fillMeta()
586587
'validation' => [
587588
'validate-number' => true,
588589
],
590+
'labelVisible' => false,
589591
],
590592
],
591593
],
@@ -601,7 +603,8 @@ protected function fillMeta()
601603
'elementTmpl' => 'Magento_GroupedProduct/components/position',
602604
'sortOrder' => 90,
603605
'fit' => true,
604-
'dataScope' => 'positionCalculated'
606+
'dataScope' => 'positionCalculated',
607+
'labelVisible' => false,
605608
],
606609
],
607610
],
@@ -660,6 +663,7 @@ protected function getTextColumn($dataScope, $fit, Phrase $label, $sortOrder)
660663
'fit' => $fit,
661664
'label' => $label,
662665
'sortOrder' => $sortOrder,
666+
'labelVisible' => false,
663667
],
664668
],
665669
],

0 commit comments

Comments
 (0)