refactoring

Author: vovsky

app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableCMSPageActionGroup.xml

@@ -0,0 +1,14 @@
+<?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="AdminDisableCMSPageActionGroup">
+        <seeElement selector="{{CmsNewPagePageBasicFieldsSection.isActive('1')}}" stepKey="seePageIsEnabled" />
+        <click selector="{{CmsNewPagePageBasicFieldsSection.isActiveLabel}}" stepKey="setPageDisabled"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageNotFoundOnFrontActionGroup.xml renamed to app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageNotFoundOnStorefrontActionGroup.xml

@@ -7,12 +7,7 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertCMSPageNotFoundOnFront">
-        <arguments>
-            <argument name="identifier" type="string"/>
-        </arguments>
-        <amOnPage url="{{StorefrontHomePage.url}}/{{identifier}}" stepKey="amOnPageOnFrontend"/>
-        <waitForPageLoad stepKey="waitForPageLoadOnFrontend"/>
-        <see userInput="Whoops, our bad..." stepKey="seePageErrorForFirstPage"/>
+    <actionGroup name="AssertCMSPageNotFoundOnStorefrontActionGroup">
+        <see userInput="Whoops, our bad..." stepKey="seePageErrorNotFound"/>
     </actionGroup>
-</actionGroups>
+</actionGroups>

app/code/Magento/Cms/Test/Mftf/ActionGroup/StorefrontCMSPageNavigateToPageActionGroup.xml renamed to app/code/Magento/Cms/Test/Mftf/ActionGroup/StorefrontGoToCMSPageActionGroup.xml

@@ -7,10 +7,11 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="StorefrontCMSPageNavigateToPage">
+    <actionGroup name="StorefrontGoToCMSPageActionGroup">
         <arguments>
             <argument name="identifier" type="string"/>
         </arguments>
         <amOnPage url="{{StorefrontHomePage.url}}/{{identifier}}" stepKey="amOnCmsPageOnStorefront"/>
+        <waitForPageLoad stepKey="waitForPageLoadOnStorefront"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageUpdateAndDisableTest.xml

@@ -32,12 +32,13 @@
         <!--Fill data using _duplicatedCMSPage-->
         <actionGroup ref="FillOutCMSPageContent" stepKey="fillNewData"/>
         <!--Deactivate page-->
-        <actionGroup ref="AdminCMSPageSetDisabled" stepKey="disablePage"/>
+        <actionGroup ref="AdminDisableCMSPageActionGroup" stepKey="setPageDisabled"/>
         <!--Save page-->
-        <actionGroup ref="saveCmsPage" stepKey="saveDeactivatedPage"/>
-        <!--Check that page is not found on frontend-->
-        <actionGroup ref="AssertCMSPageNotFoundOnFront" stepKey="checkPageIsDisabledOnStorefront">
+        <actionGroup ref="saveCmsPage" stepKey="saveDisabledPage"/>
+        <!--Check that page is not found on storefront-->
+        <actionGroup ref="StorefrontGoToCMSPageActionGroup" stepKey="goToCMSPageOnStorefront">
             <argument name="identifier" value="{{_duplicatedCMSPage.identifier}}"/>
         </actionGroup>
+        <actionGroup ref="AssertCMSPageNotFoundOnStorefrontActionGroup" stepKey="seeNotFoundError"/>
     </test>
 </tests>

app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageUpdateTest.xml

@@ -38,7 +38,7 @@
         </actionGroup>
         <actionGroup ref="AssertCMSPageContent" stepKey="verifyPageDataInAdmin"/>
         <!--Verify data on frontend-->
-        <actionGroup ref="StorefrontCMSPageNavigateToPage" stepKey="navigateToPageOnStorefront">
+        <actionGroup ref="StorefrontGoToCMSPageActionGroup" stepKey="navigateToPageOnStorefront">
             <argument name="identifier" value="{{_duplicatedCMSPage.identifier}}"/>
         </actionGroup>
         <actionGroup ref="AssertStoreFrontCMSPage" stepKey="verifyPageDataOnFrontend">