Skip to content

Commit b40beda

Browse files
glo74170Manjusha.S
glo74170
authored and
Manjusha.S
committed
MC-27423: Changing the new catagory with existing catagory
1 parent be61d85 commit b40beda

File tree

2 files changed

+17
-44
lines changed

2 files changed

+17
-44
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -279,28 +279,4 @@
279279
<var key="category_id" entityKey="id" entityType="category"/>
280280
<var key="sku" entityKey="sku" entityType="product"/>
281281
</entity>
282-
<entity name="NewCategory" type="category">
283-
<data key="name" unique="suffix">NewCategory</data>
284-
<data key="name_lwr" unique="suffix">newcategory</data>
285-
<data key="urlKey" unique="suffix">newcategory</data>
286-
<data key="is_active">true</data>
287-
<data key="include_in_menu">true</data>
288-
<data key="parent_id">1</data>
289-
</entity>
290-
<entity name="Category1" type="category">
291-
<data key="name" unique="suffix">Category1</data>
292-
<data key="name_lwr" unique="suffix">category1</data>
293-
<data key="urlKey" unique="suffix">category1</data>
294-
<data key="is_active">true</data>
295-
<data key="include_in_menu">true</data>
296-
<data key="parent_id">1</data>
297-
</entity>
298-
<entity name="Category2" type="category">
299-
<data key="name" unique="suffix">Category2</data>
300-
<data key="name_lwr" unique="suffix">category2</data>
301-
<data key="urlKey" unique="suffix">category2</data>
302-
<data key="is_active">true</data>
303-
<data key="include_in_menu">true</data>
304-
<data key="parent_id">1</data>
305-
</entity>
306282
</entities>

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

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
<waitForPageLoad stepKey="waitForPageLoad1"/>
2727
<!--Create subcategory-->
2828
<actionGroup ref="CreateCategoryActionGroup" stepKey="createSubcategory1">
29-
<argument name="categoryEntity" value="NewCategory"/>
29+
<argument name="categoryEntity" value="SubCategory"/>
3030
</actionGroup>
3131

3232
<!--Open the root category and add subcategory with same name. Save category.-->
3333
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="amOnAdminCategoryPage1"/>
3434
<waitForPageLoad stepKey="waitForPageLoad2"/>
3535
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
3636
<checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableNewCategory"/>
37-
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{NewCategory.name}}" stepKey="fillSameSubCategoryName"/>
37+
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SubCategory.name}}" stepKey="fillSameSubCategoryName"/>
3838
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSameSubCategoryFirstTime"/>
3939
<seeElement selector="{{AdminCategoryBasicFieldSection.errorMessages}}" stepKey="validateErrorMessages"/>
4040
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSameSubCategoryAgain"/>
@@ -45,13 +45,13 @@
4545
<waitForPageLoad stepKey="waitForPageLoadAgain"/>
4646
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton1"/>
4747
<actionGroup ref="CreateCategoryActionGroup" stepKey="createNewSubcategory1">
48-
<argument name="categoryEntity" value="Category1"/>
48+
<argument name="categoryEntity" value="FirstLevelSubCat"/>
4949
</actionGroup>
50-
<click selector="{{Category1.name}}" stepKey="clickOnCreateCategory1"/>
50+
<click selector="{{FirstLevelSubCat.name}}" stepKey="clickOnCreateCategory1"/>
5151
<waitForPageLoad stepKey="waitForCategory1PageLoad"/>
5252
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory1Button"/>
5353
<checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory1"/>
54-
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{NewCategory.name}}" stepKey="fillFirstSubCategoryName"/>
54+
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SubCategory.name}}" stepKey="fillFirstSubCategoryName"/>
5555
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveFirstSubCategory"/>
5656

5757
<!-- Verify success message -->
@@ -62,13 +62,13 @@
6262
<waitForPageLoad stepKey="waitForCategory2PageLoad"/>
6363
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton2"/>
6464
<actionGroup ref="CreateCategoryActionGroup" stepKey="createNewSubcategory2">
65-
<argument name="categoryEntity" value="Category2"/>
65+
<argument name="categoryEntity" value="SecondLevelSubCat"/>
6666
</actionGroup>
67-
<click selector="{{Category2.name}}" stepKey="clickOnCreateCategory2"/>
67+
<click selector="{{SecondLevelSubCat.name}}" stepKey="clickOnCreateCategory2"/>
6868
<waitForPageLoad stepKey="waitForPageLoad3"/>
6969
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory2Button"/>
7070
<checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory2"/>
71-
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{NewCategory.name}}" stepKey="fillSecondSubCategoryName"/>
71+
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SubCategory.name}}" stepKey="fillSecondSubCategoryName"/>
7272
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSecondSubCategory"/>
7373

7474
<!-- Verify success message -->
@@ -79,53 +79,50 @@
7979

8080
<!-- Check on storefront that category was created, Its URL path is '.../new.html' -->
8181
<actionGroup ref="StorefrontNavigateToCategoryUrlActionGroup" stepKey="goToCategoryStorefrontPage1">
82-
<argument name="categoryUrl" value="{{NewCategory.urlKey}}"/>
82+
<argument name="categoryUrl" value="{{SubCategory.urlKey}}"/>
8383
</actionGroup>
8484
<see userInput="{{NewCategory.name}}" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="assertCategoryNewHtmlOnStorefront"/>
8585

8686
<!-- Check on storefront that category was created, Its URL path is '.../cat1/new.html'-->
87-
<amOnPage url="/{{Category1.name}}/{{NewCategory.name}}.html" stepKey="goToConfigProductPage1"/>
87+
<amOnPage url="/{{FirstLevelSubCat.name}}/{{SubCategory.name}}.html" stepKey="goToConfigProductPage1"/>
8888
<seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="assertCategoryCat1NewHtmlOnStorefront"/>
8989

9090
<!--Check on storefront that category was created, Its URL path is '.../cat2/new.html'-->
91-
<amOnPage url="/{{Category2.name}}/{{NewCategory.name}}.html" stepKey="goToConfigProductPage2"/>
91+
<amOnPage url="/{{SecondLevelSubCat.name}}/{{SubCategory.name}}.html" stepKey="goToConfigProductPage2"/>
9292
<seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="assertCategoryCat2NewHtmlOnStorefront"/>
9393

9494
<after>
95-
<!-- delete NewCategory -->
9695
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="goToCategoryPage1"/>
9796
<wait stepKey="k3" time="100"/>
98-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(Category2.name)}}" stepKey="clickCategoryLink"/>
97+
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SecondLevelSubCat.name)}}" stepKey="clickCategoryLink"/>
9998
<click selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="clickDelete"/>
10099
<waitForElementVisible selector="{{AdminCategoryModalSection.message}}" stepKey="waitForConfirmationModal"/>
101100
<see selector="{{AdminCategoryModalSection.message}}" userInput="Are you sure you want to delete this category?" stepKey="seeDeleteConfirmationMessage"/>
102101
<click selector="{{AdminCategoryModalSection.ok}}" stepKey="confirmDelete"/>
103102
<waitForPageLoad time="60" stepKey="waitForDeleteToFinish"/>
104103
<see selector="You deleted the category." stepKey="seeDeleteSuccess"/>
105104
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="expandToSeeAllCategories"/>
106-
<dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(Category2.name)}}" stepKey="dontSeeCategoryInTree"/>
105+
<dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(SecondLevelSubCat.name)}}" stepKey="dontSeeCategoryInTree"/>
107106

108-
<!-- delete Category1 -->
109-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(Category1.name)}}" stepKey="clickCategoryLink1"/>
107+
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(FirstLevelSubCat.name)}}" stepKey="clickCategoryLink1"/>
110108
<click selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="clickDelete1"/>
111109
<waitForElementVisible selector="{{AdminCategoryModalSection.message}}" stepKey="waitForConfirmationModal1"/>
112110
<see selector="{{AdminCategoryModalSection.message}}" userInput="Are you sure you want to delete this category?" stepKey="seeDeleteConfirmationMessage1"/>
113111
<click selector="{{AdminCategoryModalSection.ok}}" stepKey="confirmDelete1"/>
114112
<waitForPageLoad time="60" stepKey="waitForDeleteToFinish1"/>
115113
<see selector="You deleted the category." stepKey="seeDeleteSuccess1"/>
116114
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="expandToSeeAllCategories1"/>
117-
<dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(Category1.name)}}" stepKey="dontSeeCategoryInTree1"/>
115+
<dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(FirstLevelSubCat.name)}}" stepKey="dontSeeCategoryInTree1"/>
118116

119-
<!-- delete Category2 -->
120-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(NewCategory.name)}}" stepKey="clickCategoryLink2"/>
117+
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SubCategory.name)}}" stepKey="clickCategoryLink2"/>
121118
<click selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="clickDelete2"/>
122119
<waitForElementVisible selector="{{AdminCategoryModalSection.message}}" stepKey="waitForConfirmationModal2"/>
123120
<see selector="{{AdminCategoryModalSection.message}}" userInput="Are you sure you want to delete this category?" stepKey="seeDeleteConfirmationMessage2"/>
124121
<click selector="{{AdminCategoryModalSection.ok}}" stepKey="confirmDelete2"/>
125122
<waitForPageLoad time="60" stepKey="waitForDeleteToFinish2"/>
126123
<see selector="You deleted the category." stepKey="seeDeleteSuccess2"/>
127124
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="expandToSeeAllCategories2"/>
128-
<dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(NewCategory.name)}}" stepKey="dontSeeCategoryInTree2"/>
125+
<dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(SubCategory.name)}}" stepKey="dontSeeCategoryInTree2"/>
129126

130127
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
131128
</after>

0 commit comments

Comments
 (0)