refactoring, fixing code review notes

vovsky · vovsky · commit 0bb861c55712 · 2019-05-01T11:31:29.000+03:00
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableCMSPageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableCMSPageActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminCMSPageSetDisabled">
+    <actionGroup name="AdminDisableCMSPage">
         <seeElement selector="{{CmsNewPagePageBasicFieldsSection.isActive('1')}}" stepKey="seePageIsEnabled" />
         <click selector="{{CmsNewPagePageBasicFieldsSection.isActiveLabel}}" stepKey="setPageDisabled"/>
     </actionGroup>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminFillCMSPageContentFieldActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminFillCMSPageContentFieldActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminCmsPageFillContentField">
+    <actionGroup name="AdminFillCMSPageContentFieldActionGroup">
         <arguments>
             <argument name="content" type="string"/>
         </arguments>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCMSPagesGridActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCMSPagesGridActionGroup.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="AdminOpenCMSPagesGridActionGroup">
+        <amOnPage url="{{CmsPagesPage.url}}" stepKey="navigateToCMSPagesGrid"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCreateNewCMSPageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCreateNewCMSPageActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminCmsPageNavigateToCreateNewPage">
+    <actionGroup name="AdminOpenCreateNewCMSPageActionGroup">
         <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToCreateNewPage"/>
         <waitForPageLoad stepKey="waitForNewPagePageLoad"/>
     </actionGroup>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSPageFromGridActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSPageFromGridActionGroup.xml
@@ -0,0 +1,16 @@
+<?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="AdminSelectCMSPageFromGridActionGroup">
+        <arguments>
+            <argument name="identifier" defaultValue=""/>
+        </arguments>
+        <click selector="{{CmsPagesPageActionsSection.select(identifier)}}" stepKey="clickSelectCMSPage" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSPageStoreViewActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSPageStoreViewActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminCmsPageSelectPageStoreView">
+    <actionGroup name="AdminSelectCMSPageStoreViewActionGroup">
         <arguments>
             <argument name="storeViewName" type="string"/>
         </arguments>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageInGridActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageInGridActionGroup.xml
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageNotFoundOnStorefrontActionGroup.xml b/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="amOnPageOnStorefront"/>
-        <waitForPageLoad stepKey="waitForPageLoadOnStorefront"/>
+    <actionGroup name="AssertCMSPageNotFoundOnStorefrontActionGroup">
         <see userInput="Whoops, our bad..." stepKey="seePageErrorNotFound"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageStoreIdActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageStoreIdActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertCMSPageStoreId">
+    <actionGroup name="AssertCMSPageStoreIdActionGroup">
         <arguments>
             <argument name="storeId" type="string"/>
         </arguments>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/StorefrontGoToCMSPageActionGroup.xml b/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>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePiwSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePiwSection.xml
@@ -11,6 +11,6 @@
     <section name="CmsNewPagePiwSection">
         <element name="header" type="button" selector="div[data-index=websites]" timeout="30"/>
         <element name="selectStoreView" type="select" selector="//option[contains(text(),'{{var1}}')]" parameterized="true"/>
-        <element name="storeIdDropdown" type="select" selector="select[name='store_id']"/>
+        <element name="storeIdDropdown" type="select" selector="//div[@data-bind=&quot;scope: 'cms_page_form.cms_page_form'&quot;]//select[@name='store_id']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageCreateDisabledPageTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageCreateDisabledPageTest.xml
@@ -23,17 +23,18 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!--Go to New CMS Page page-->
-        <actionGroup ref="AdminCmsPageNavigateToCreateNewPage" stepKey="navigateToCreateNewPage"/>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToCreateNewPage"/>
         <!--Fill the CMS page form-->
         <actionGroup ref="FillOutCMSPageContent" stepKey="fillBasicPageDataForDisabledPage"/>
         <!--Set page disabled-->
-        <actionGroup ref="AdminCMSPageSetDisabled" stepKey="setCMSPageDisabled"/>
+        <actionGroup ref="AdminDisableCMSPage" stepKey="setCMSPageDisabled"/>
         <!--Verify successfully saved-->
         <actionGroup ref="saveCmsPage" stepKey="saveDisabledPage"/>
         <!--Check that page is disabled on frontend-->
-        <actionGroup ref="AssertCMSPageNotFoundOnFront" stepKey="checkFirstPageNotFoundOnFront">
+        <actionGroup ref="StorefrontGoToCMSPageActionGroup" stepKey="goToCMSPageOnStorefront">
             <argument name="identifier" value="{{_duplicatedCMSPage.identifier}}"/>
         </actionGroup>
+        <actionGroup ref="AssertCMSPageNotFoundOnStorefrontActionGroup" stepKey="seeNotFoundError"/>
         <!--Delete page-->
         <actionGroup ref="DeletePageByUrlKeyActionGroup" stepKey="deleteDisabledPage">
             <argument name="UrlKey" value="{{_duplicatedCMSPage.identifier}}"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageCreatePageForDefaultStoreTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageCreatePageForDefaultStoreTest.xml
@@ -23,10 +23,10 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!--Go to New CMS Page page-->
-        <actionGroup ref="AdminCmsPageNavigateToCreateNewPage" stepKey="navigateToCreateNewPage"/>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToCreateNewPage"/>
         <!--Fill the CMS page form-->
         <actionGroup ref="FillOutCMSPageContent" stepKey="fillBasicPageDataForPageWithDefaultStore"/>
-        <actionGroup ref="AdminCmsPageSelectPageStoreView" stepKey="selectCMSPageStoreView">
+        <actionGroup ref="AdminSelectCMSPageStoreViewActionGroup" stepKey="selectCMSPageStoreView">
             <argument name="storeViewName" value="Default Store View"/>
         </actionGroup>
         <!--Verify successfully saved-->
@@ -38,7 +38,7 @@
         <!--Verify Page Data in Admin-->
         <actionGroup ref="AssertCMSPageContent" stepKey="verifyPageWithDefaultStoreDataInAdmin"/>
         <!--Verify Store ID-->
-        <actionGroup ref="AssertCMSPageStoreId" stepKey="verifyStoreId">
+        <actionGroup ref="AssertCMSPageStoreIdActionGroup" stepKey="verifyStoreId">
             <argument name="storeId" value="1"/>
         </actionGroup>
         <!--Delete page-->
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageCreatePageInSingleStoreModeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageCreatePageInSingleStoreModeTest.xml
@@ -21,17 +21,17 @@
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <magentoCLI command="config:set {{StorefrontSingleStoreModeDisabledConfigData.path}} {{StorefrontSingleStoreModeDisabledConfigData.value}}" stepKey="enableSingleStoreMode" />
+            <magentoCLI command="config:set {{StorefrontSingleStoreModeDisabledConfigData.path}} {{StorefrontSingleStoreModeDisabledConfigData.value}}" stepKey="disableSingleStoreMode" />
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!--Go to New CMS Page page-->
-        <actionGroup ref="AdminCmsPageNavigateToCreateNewPage" stepKey="navigateToCreateNewPage"/>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToCreateNewPage"/>
         <!--Fill the CMS page form-->
         <actionGroup ref="FillOutCMSPageContent" stepKey="fillBasicPageDataForPageWithDefaultStore"/>
         <!--Verify successfully saved-->
         <actionGroup ref="saveCmsPage" stepKey="savePageInSingleStoreMode"/>
         <!--verify page on frontend-->
-        <actionGroup ref="StorefrontCMSPageNavigateToPage" stepKey="navigateToPageOnStoreFront">
+        <actionGroup ref="StorefrontGoToCMSPageActionGroup" stepKey="navigateToPageOnStoreFront">
             <argument name="identifier" value="{{_duplicatedCMSPage.identifier}}"/>
         </actionGroup>
         <actionGroup ref="AssertStoreFrontCMSPage" stepKey="verifyPageDataOnFrontend">
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageCreatePageTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageCreatePageTest.xml
@@ -23,12 +23,12 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!--Go to New CMS Page page-->
-        <actionGroup ref="AdminCmsPageNavigateToCreateNewPage" stepKey="navigateToCreateNewPage"/>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToCreateNewPage"/>
         <actionGroup ref="FillOutCMSPageContent" stepKey="fillBasicPageData"/>
         <!--verify successfully saved-->
         <actionGroup ref="saveCmsPage" stepKey="saveNewPage"/>
         <!--verify page on frontend-->
-        <actionGroup ref="StorefrontCMSPageNavigateToPage" stepKey="navigateToPageOnStoreFront">
+        <actionGroup ref="StorefrontGoToCMSPageActionGroup" stepKey="navigateToPageOnStoreFront">
             <argument name="identifier" value="{{_duplicatedCMSPage.identifier}}"/>
         </actionGroup>
         <actionGroup ref="AssertStoreFrontCMSPage" stepKey="verifyPageDataOnFrontend">
@@ -37,7 +37,10 @@
             <argument name="cmsContentHeading" value="{{_duplicatedCMSPage.content_heading}}"/>
         </actionGroup>
         <!--verify page in grid-->
-        <actionGroup ref="AssertCMSPageInGrid" stepKey="verifyPageInGrid">
+        <actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="openCMSPagesGridActionGroup"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilters"/>
+        <actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortGridByIdDescending"/>
+        <actionGroup ref="AdminSelectCMSPageFromGridActionGroup" stepKey="verifyPageInGrid">
             <argument name="identifier" value="_duplicatedCMSPage.identifier"/>
         </actionGroup>
         <actionGroup ref="DeletePageByUrlKeyActionGroup" stepKey="deletePage">
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageCreatePageWithBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageCreatePageWithBlockTest.xml
@@ -23,18 +23,18 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!--Go to New CMS Page page-->
-        <actionGroup ref="AdminCmsPageNavigateToCreateNewPage" stepKey="navigateToCreateNewPage"/>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToCreateNewPage"/>
         <actionGroup ref="FillOutCMSPageContent" stepKey="fillBasicPageData"/>
-        <actionGroup ref="AdminCmsPageFillContentField" stepKey="fillContentField">
+        <actionGroup ref="AdminFillCMSPageContentFieldActionGroup" stepKey="fillContentField">
             <argument name="content" value="{{block class=&apos;Magento\Framework\View\Element\Text&apos; text=&apos;bla bla bla&apos; cache_key=&apos;BACKEND_ACL_RESOURCES&apos; cache_lifetime=999}}"/>
         </actionGroup>
-        <actionGroup ref="AdminCmsPageSelectPageStoreView" stepKey="selectCMSPageStoreViewForPageWithBlock">
+        <actionGroup ref="AdminSelectCMSPageStoreViewActionGroup" stepKey="selectCMSPageStoreViewForPageWithBlock">
             <argument name="storeViewName" value="Default Store View"/>
         </actionGroup>
         <!--Verify successfully saved-->
         <actionGroup ref="saveCmsPage" stepKey="savePageWithBlock"/>
         <!--verify page on frontend-->
-        <actionGroup ref="StorefrontCMSPageNavigateToPage" stepKey="navigateToPageOnStoreFront">
+        <actionGroup ref="StorefrontGoToCMSPageActionGroup" stepKey="navigateToPageOnStoreFront">
             <argument name="identifier" value="{{_duplicatedCMSPage.identifier}}"/>
         </actionGroup>
         <actionGroup ref="AssertStoreFrontCMSPage" stepKey="verifyPageWithBlockDataOnFrontend">
