Skip to content

Commit f49f093

Browse files
glo74186Manjusha.S
glo74186
authored and
Manjusha.S
committed
did required changes
1 parent 7fe731f commit f49f093

File tree

3 files changed

+82
-67
lines changed

3 files changed

+82
-67
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateCustomGroupInAnAttriubuteSetActionGroup.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<!-- ActionGroup will add a single custom option to a product
12-
You must already be on the product creation page -->
1311
<actionGroup name="AdminCreateCustomGroupInAnAttributeSetActionGroup">
1412
<annotations>
1513
<description> Admin Create Custom Group In An Attribute Set</description>
@@ -24,14 +22,17 @@
2422
<fillField selector="{{AdminProductAttributeSetGridSection.filter}}" userInput="{{name}}" stepKey="filterByName"/>
2523
<click selector="{{AdminProductAttributeSetGridSection.searchBtn}}" stepKey="clickSearch"/>
2624
<click selector="{{AdminProductAttributeSetGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
27-
<waitForPageLoad stepKey="waitForPageLoad"/>
25+
<waitForPageLoad stepKey="waitForClickNewButton"/>
2826
<click selector="{{AdminProductAttributeSetEditSection.AddNewGroup}}" stepKey="clickAddNew"/>
29-
<wait stepKey="k1" time="20"/>
27+
<waitForPageLoad stepKey="waitForFillname"/>
3028
<fillField userInput="" selector="{{AdminProductAttributeSetEditSection.newGroupName}}" stepKey="fillName"/>
31-
<wait stepKey="k2" time="20"/>
29+
<waitForPageLoad stepKey="waitForClickOk"/>
3230
<click selector="{{AdminProductAttributeSetEditSection.buttonOk}}" stepKey="clickOk"/>
3331
<see userInput="This is a required field." selector="{{AdminProductAttributeSetEditSection.errorLabel}}" stepKey="seeErrorMessage"/>
3432
<fillField userInput="{{customGroupName}}" selector="{{AdminProductAttributeSetEditSection.newGroupName}}" stepKey="fillCustomGroupName"/>
3533
<click selector="{{AdminProductAttributeSetEditSection.buttonOk}}" stepKey="clickButtonOk"/>
34+
<click selector="{{AdminProductAttributeSetActionSection.save}}" stepKey="clickSave"/>
35+
<see userInput="You saved the attribute set" selector="{{AdminMessagesSection.success}}" stepKey="successMessage"/>
36+
3637
</actionGroup>
3738
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteCustomGroupDragAndDropAttributesInAnAttributeSetActionGroup.xml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
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="AdminDeleteCustomGroupDragAndDropAttributesInAnAttributeSetActionGroup">
12+
<annotations>
13+
<description> Admin Delete Custom Group In An Attribute Set</description>
14+
</annotations>
15+
16+
<arguments>
17+
<argument name="name" type="string"/>
18+
<argument name="customGroupName" type="string"/>
19+
</arguments>
20+
<amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSetPage"/>
21+
<click selector="{{AdminProductAttributeSetGridSection.resetFilter}}" stepKey="clickResetButton"/>
22+
<fillField selector="{{AdminProductAttributeSetGridSection.filter}}" userInput="{{name}}" stepKey="filterByName"/>
23+
<click selector="{{AdminProductAttributeSetGridSection.searchBtn}}" stepKey="clickSearch"/>
24+
<click selector="{{AdminProductAttributeSetGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
25+
<waitForPageLoad stepKey="waitForSelectCustomGroup"/>
26+
<!-- Delete created custom group -->
27+
<click selector="{{AdminProductAttributeSetEditSection.attributeGroup(customGroupName)}}" stepKey="selectCustomGroup"/>
28+
<click selector="{{AdminProductAttributeSetEditSection.DeleteSelectedGroup}}" stepKey="clickDeleteSelectedGroup"/>
29+
<waitForPageLoad stepKey="waitForAttentionMessage"/>
30+
<seeElement selector="{{AdminProductAttributeSetEditSection.attentionMessage}}" stepKey="assertCustomGroup"/>
31+
<click selector="{{AdminProductAttributeSetEditSection.buttonOk}}" stepKey="clickOk"/>
32+
<waitForPageLoad stepKey="waitForDragAndDropAttributes"/>
33+
<dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute('price')}}" selector2="{{AdminProductAttributeSetEditSection.attributeGroup('Product Details')}}" stepKey="dragAndDrop3"/>
34+
<dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute('sku')}}" selector2="{{AdminProductAttributeSetEditSection.attributeGroup('Product Details')}}" stepKey="dragAndDrop4"/>
35+
<click selector="{{AdminProductAttributeSetEditSection.attributeGroup('Custom Group')}}" stepKey="selectCustomGroup1"/>
36+
<click selector="{{AdminProductAttributeSetEditSection.DeleteSelectedGroup}}" stepKey="deleteSelectedGroup1"/>
37+
<waitForPageLoad stepKey="waitForClickSave"/>
38+
<click selector="{{AdminProductAttributeSetActionSection.save}}" stepKey="clickSave"/>
39+
<see userInput="You saved the attribute set" selector="{{AdminMessagesSection.success}}" stepKey="successMessage"/>
40+
41+
</actionGroup>
42+
</actionGroups>

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

Lines changed: 34 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -19,84 +19,56 @@
1919
<group value="catalog"/>
2020
</annotations>
2121

22-
<before>
23-
24-
<!-- Login to Admin -->
25-
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
26-
27-
<!-- Create attribute set with custom group -->
28-
<createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
29-
<actionGroup ref="AdminCreateCustomGroupInAnAttributeSetActionGroup" stepKey="createGroupInAttributeSet">
30-
<argument name="name" value="$$createAttributeSet.attribute_set_name$$"/>
31-
<argument name="customGroupName" value="Custom Group"/>
32-
</actionGroup>
33-
<wait stepKey="k1" time="10"/>
34-
35-
<!-- Drag and drop system product attributes in to custom group -->
36-
<dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute('price')}}" selector2="{{AdminProductAttributeSetEditSection.attributeGroupExtender(customGroup.name)}}" stepKey="dragAndDrop"/>
37-
<dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute('sku')}}" selector2="{{AdminProductAttributeSetEditSection.attributeGroupExtender(customGroup.name)}}" stepKey="dragAndDrop1"/>
38-
39-
<!-- Click Save Attribute -->
40-
<actionGroup ref="SaveAttributeSetActionGroup" stepKey="saveAttribute"/>
41-
42-
</before>
43-
44-
<after>
45-
46-
<!-- Delete attribute set -->
47-
<deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
48-
49-
<!-- Logout from Admin -->
50-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
51-
52-
</after>
53-
54-
<!-- Navigate to Stores > Attributes > Attribute Set -->
55-
<amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSetPage"/>
56-
<waitForPageLoad stepKey="waitForPageLoad"/>
57-
58-
<!-- Search and open Attribute Set from preconditions -->
59-
<actionGroup ref="GoToAttributeSetByNameActionGroup" stepKey="searchAttribute">
22+
<before>
23+
24+
<!-- Login to Admin -->
25+
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
26+
<!-- Create attribute set with custom group -->
27+
<createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
28+
<actionGroup ref="AdminCreateCustomGroupInAnAttributeSetActionGroup" stepKey="createGroupInAttributeSet">
29+
<argument name="name" value="$$createAttributeSet.attribute_set_name$$"/>
30+
<argument name="customGroupName" value="Custom Group"/>
31+
</actionGroup>
32+
<actionGroup ref="GoToAttributeSetByNameActionGroup" stepKey="OpenAttributeSet">
33+
<argument name="name" value="$$createAttributeSet.attribute_set_name$$"/>
34+
</actionGroup>
35+
<waitForPageLoad stepKey="waitForDragAndDropAttributes"/>
36+
<!-- Drag and drop system product attributes in to custom group -->
37+
<dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute('price')}}" selector2="{{AdminProductAttributeSetEditSection.attributeGroupExtender(customGroup.name)}}" stepKey="dragAndDrop"/>
38+
<dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute('sku')}}" selector2="{{AdminProductAttributeSetEditSection.attributeGroupExtender(customGroup.name)}}" stepKey="dragAndDrop1"/>
39+
<!-- Click Save Attribute -->
40+
<actionGroup ref="SaveAttributeSetActionGroup" stepKey="saveAttribute"/>
41+
42+
</before>
43+
44+
<after>
45+
46+
<!-- Delete attribute set -->
47+
<deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
48+
<!-- Logout from Admin -->
49+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
50+
51+
</after>
52+
<!-- Open attribute set and delete custom group -->
53+
<actionGroup ref="AdminDeleteCustomGroupDragAndDropAttributesInAnAttributeSetActionGroup" stepKey="deleteGroupInAttributeSet">
6054
<argument name="name" value="$$createAttributeSet.attribute_set_name$$"/>
55+
<argument name="customGroupName" value="Custom Group"/>
6156
</actionGroup>
6257

63-
<!-- Delete created custom group -->
64-
<click selector="{{AdminProductAttributeSetEditSection.attributeGroup('Custom Group')}}" stepKey="selectCustomGroup"/>
65-
<click selector="{{AdminProductAttributeSetEditSection.DeleteSelectedGroup}}" stepKey="clickDeleteSelectedGroup"/>
66-
<wait stepKey="k3" time="20"/>
67-
<seeElement selector="{{AdminProductAttributeSetEditSection.attentionMessage}}" stepKey="assertCustomGroup"/>
68-
<click selector="{{AdminProductAttributeSetEditSection.buttonOk}}" stepKey="clickOk"/>
69-
<wait stepKey="k4" time="10"/>
70-
71-
<!-- Drag and drop product attributes to its original groups -->
72-
<dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute('price')}}" selector2="{{AdminProductAttributeSetEditSection.attributeGroup('Product Details')}}" stepKey="dragAndDrop3"/>
73-
<dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute('sku')}}" selector2="{{AdminProductAttributeSetEditSection.attributeGroup('Product Details')}}" stepKey="dragAndDrop4"/>
74-
<click selector="{{AdminProductAttributeSetEditSection.attributeGroup('Custom Group')}}" stepKey="selectCustomGroup1"/>
75-
<click selector="{{AdminProductAttributeSetEditSection.DeleteSelectedGroup}}" stepKey="deleteSelectedGroup1"/>
76-
77-
<wait stepKey="k5" time="10"/>
78-
79-
<!-- Click 'Save' -->
80-
<actionGroup ref="SaveAttributeSetActionGroup" stepKey="saveAttribute1"/>
81-
8258
<!-- Again open attribute set and search for custom group -->
8359
<actionGroup ref="GoToAttributeSetByNameActionGroup" stepKey="searchAttribute1">
8460
<argument name="name" value="$$createAttributeSet.attribute_set_name$$"/>
8561
</actionGroup>
86-
8762
<!-- Custom Group is absent in attribute set -->
8863
<dontSeeElement selector="{{AdminProductAttributeSetEditSection.attributeGroup('Custom Group')}}" stepKey="assertCustomGroupIsNotPresent"/>
89-
9064
<!-- Navigate to Catalog > Products -->
9165
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductPage"/>
92-
9366
<!-- Start to create a new simple product with the custom attribute set from the preconditions -->
9467
<click selector="{{AdminProductGridActionSection.addProductBtn}}" stepKey="clickAddProduct"/>
95-
<waitForPageLoad stepKey="waitForNewProductPage"/>
68+
<waitForPageLoad stepKey="waitForSelectAttribute"/>
9669
<actionGroup ref="AdminProductPageSelectAttributeSetActionGroup" stepKey="selectAttribute">
9770
<argument name="attributeSetName" value="$$createAttributeSet.attribute_set_name$$"/>
9871
</actionGroup>
99-
10072
<!-- Custom Group is absent in attribute set -->
10173
<dontSeeElement selector="{{AdminProductAttributeSection.attributeGroupByName('Custom Group')}}" stepKey="dontSeeCustomGroup"/>
10274

0 commit comments

Comments
 (0)