Refactoring the test

Author: kate-kyzyma

app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCategoryNameIsNotShownInMenuActionGroup.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup">
+        <annotations>
+            <description>Validate that the Category is not present in menu on Frontend.</description>
+        </annotations>
+        <arguments>
+            <argument name="categoryName" type="string"/>
+        </arguments>
+
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(categoryName)}}"
+                        stepKey="doNotSeeCatergoryInStoreFront"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCategoryNameIsShownActionGroup.xml renamed to app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCategoryNameIsShownInMenuActionGroup.xml

@@ -8,9 +8,9 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="StorefrontAssertCategoryNameIsShownActionGroup">
+    <actionGroup name="StorefrontAssertCategoryNameIsShownInMenuActionGroup">
         <annotations>
-            <description>Validate that the Category is present on Frontend.</description>
+            <description>Validate that the Category is present in menu on Frontend.</description>
         </annotations>
         <arguments>
             <argument name="categoryName" type="string"/>

app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontNavigateToSpecifiedUrlActionGroup.xml

@@ -53,7 +53,7 @@
         <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="goToCategoryPage">
             <argument name="categoryName" value="$$category.name$$"/>
         </actionGroup>
-        <actionGroup ref="StorefrontAssertCategoryNameIsShownActionGroup" stepKey="seeCatergoryInStoreFront">
+        <actionGroup ref="StorefrontAssertCategoryNameIsShownInMenuActionGroup" stepKey="seeCatergoryInStoreFront">
             <argument name="categoryName" value="$$category.name$$"/>
         </actionGroup>
 
@@ -69,16 +69,17 @@
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
 
         <!--Verify the Category is not present in Store Front-->
-        <!--<amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront1"/>-->
-
-        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="dontSeeCatergoryInStoreFront"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openHomepage"/>
+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage">
+            <argument name="categoryName" value="{{_defaultCategory.name}}"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="doNotSeeOldCategoryNameInStoreFront">
+            <argument name="categoryName" value="{{SimpleRootSubCategory.name}}"/>
+        </actionGroup>
 
         <!--Verify the Updated Category is present in Store Front-->
-        <!--<amOnPage url="" stepKey="seeTheUpdatedCategoryInStoreFront"/>-->
-        <!--<waitForPageLoad stepKey="waitForPageToLoaded3"/>-->
-        <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategoryPage">
-            <argument name="pageUrl" value="/{{NewRootCategory.name}}/{{_defaultCategory.name}}.html"/>
+        <actionGroup ref="StorefrontAssertCategoryNameIsShownInMenuActionGroup" stepKey="seeUpdatedCatergoryNameInStoreFront">
+            <argument name="categoryName" value="{{_defaultCategory.name}}"/>
         </actionGroup>
-        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeUpdatedCatergoryInStoreFront"/>
     </test>
 </tests>