Merge pull request #6330 from magento-tsg/2.4-develop-sidecar-pr6

[Sidecar] Fixes for 2.4 (pr6)
magento · Nov 7, 2020 · 6580469 · 6580469
2 parents c0dd908 + 23161d8
commit 6580469
Show file tree

Hide file tree

Showing 17 changed files with 1,660 additions and 157 deletions.
diff --git a/app/code/Magento/Cms/Test/Mftf/Data/BlockData.xml b/app/code/Magento/Cms/Test/Mftf/Data/BlockData.xml
@@ -15,4 +15,11 @@
         <data key="content">sales25off everything!</data>
         <data key="is_active">0</data>
     </entity>
+    <entity name="ActiveTestBlock" type="block">
+        <data key="title" unique="suffix">Test Block</data>
+        <data key="identifier" unique="suffix">ActiveTestBlock</data>
+        <data key="store_id">All Store Views</data>
+        <data key="content">Test Block content</data>
+        <data key="is_active">1</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminUseQuickSearchInAdminDataGridsTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminUseQuickSearchInAdminDataGridsTest.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUseQuickSearchInAdminDataGridsTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="Create CMS Page"/>
+            <title value="[CMS Grids] Use quick search in Admin data grids"/>
+            <description value="Verify that Merchant can use quick search in order to simplify the data grid filtering in Admin"/>
+            <testCaseId value="MC-27559" />
+            <severity value="MAJOR"/>
+            <group value="cms"/>
+            <group value="ui"/>
+        </annotations>
+        <before>
+            <createData entity="simpleCmsPage" stepKey="createFirstCMSPage" />
+            <createData entity="_newDefaultCmsPage" stepKey="createSecondCMSPage" />
+            <createData entity="_emptyCmsPage" stepKey="createThirdCMSPage" />
+            <createData entity="Sales25offBlock" stepKey="createFirstCmsBlock"/>
+            <createData entity="ActiveTestBlock" stepKey="createSecondCmsBlock"/>
+            <createData entity="_emptyCmsBlock" stepKey="createThirdCmsBlock"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createFirstCMSPage" stepKey="deleteFirstCMSPage" />
+            <deleteData createDataKey="createSecondCMSPage" stepKey="deleteSecondCMSPage" />
+            <deleteData createDataKey="createThirdCMSPage" stepKey="deleteThirdCMSPage" />
+            <deleteData createDataKey="createFirstCmsBlock" stepKey="deleteFirstCmsBlock" />
+            <deleteData createDataKey="createSecondCmsBlock" stepKey="deleteSecondCmsBlock" />
+            <deleteData createDataKey="createThirdCmsBlock" stepKey="deleteThirdCmsBlock" />
+            <actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="navigateToCMSPageGrid"/>
+            <actionGroup ref="AdminGridFilterResetActionGroup" stepKey="clearCmsPagesGridFilters"/>
+            <actionGroup ref="AdminOpenCmsBlocksGridActionGroup" stepKey="navigateToCmsBlockGrid"/>
+            <actionGroup ref="AdminGridFilterResetActionGroup" stepKey="clearCmsBlockGridFilters"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
+        </after>
+        <!--Go to "Cms Pages Grid" page and filter by title-->
+        <actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="navigateToCmsPageGrid"/>
+        <actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="searchFirstCmsPage">
+            <argument name="keyword" value="$createFirstCMSPage.title$"/>
+        </actionGroup>
+        <see userInput="$createFirstCMSPage.title$" selector="{{AdminGridRow.rowOne}}" stepKey="seeFirstCmsPageAfterFiltering"/>
+        <actionGroup ref="AdminAssertNumberOfRecordsInUiGridActionGroup" stepKey="assertNumberOfRecordsInCmsPageGrid"/>
+        <actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="searchSecondCmsPage">
+            <argument name="keyword" value="$createSecondCMSPage.title$"/>
+        </actionGroup>
+        <see userInput="$createSecondCMSPage.title$" selector="{{AdminGridRow.rowOne}}" stepKey="seeSecondCmsPageAfterFiltering"/>
+        <actionGroup ref="AdminAssertNumberOfRecordsInUiGridActionGroup" stepKey="assertNumberOfRecordsAfterFilteringSecondCmsPage"/>
+        <actionGroup ref="AdminGridFilterResetActionGroup" stepKey="clearGridFilters"/>
+        <grabTextFrom selector="{{AdminGridHeaders.totalRecords}}" stepKey="grabTotalRecordsCmsPagesBeforeClickSearchButton"/>
+        <click selector="{{AdminDataGridHeaderSection.submitSearch}}" stepKey="clickSearchMagnifierButton"/>
+        <grabTextFrom selector="{{AdminGridHeaders.totalRecords}}" stepKey="grabTotalRecordsCmsPagesAfterClickSearchButton"/>
+        <assertEquals stepKey="assertTotalRecordsCmsPages">
+            <expectedResult type="string">$grabTotalRecordsCmsPagesBeforeClickSearchButton</expectedResult>
+            <actualResult type="string">$grabTotalRecordsCmsPagesAfterClickSearchButton</actualResult>
+        </assertEquals>
+        <actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="enterNonExistentEntityInQuickSearch">
+            <argument name="keyword" value="TestQueryNonExistentEntity"/>
+        </actionGroup>
+        <dontSeeElement selector="{{AdminDataGridTableSection.rows}}" stepKey="dontSeeResultRows"/>
+        <actionGroup ref="AdminAssertNumberOfRecordsInUiGridActionGroup" stepKey="assertNumberOfRecordsAfterFilteringNonExistentCmsPage">
+            <argument name="number" value="0"/>
+        </actionGroup>
+        <actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="searchThirdCmsPage">
+            <argument name="keyword" value="$createThirdCMSPage.title$"/>
+        </actionGroup>
+        <see userInput="$createThirdCMSPage.title$" selector="{{AdminGridRow.rowOne}}" stepKey="seeThirdCmsPageAfterFiltering"/>
+        <actionGroup ref="AdminAssertNumberOfRecordsInUiGridActionGroup" stepKey="assertNumberOfRecordsAfterFilteringThirdCmsPage"/>
+
+        <!--Go to "Cms Blocks Grid" page and filter by title-->
+        <actionGroup ref="AdminOpenCmsBlocksGridActionGroup" stepKey="navigateToCmsBlockGrid"/>
+        <actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="searchFirstCmsBlock">
+            <argument name="keyword" value="$createFirstCmsBlock.title$"/>
+        </actionGroup>
+        <see userInput="$createFirstCmsBlock.title$" selector="{{AdminGridRow.rowOne}}" stepKey="seeFirstCmsBlockAfterFiltering"/>
+        <actionGroup ref="AdminAssertNumberOfRecordsInUiGridActionGroup" stepKey="assertNumberOfRecordsInBlockGrid"/>
+        <actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="searchSecondCmsBlock">
+            <argument name="keyword" value="$createSecondCmsBlock.title$"/>
+        </actionGroup>
+        <see userInput="$createSecondCmsBlock.title$" selector="{{AdminGridRow.rowOne}}" stepKey="seeSecondCmsBlockAfterFiltering"/>
+        <actionGroup ref="AdminAssertNumberOfRecordsInUiGridActionGroup" stepKey="assertNumberOfRecordsAfterFilteringSecondBlock"/>
+        <actionGroup ref="AdminGridFilterResetActionGroup" stepKey="clearGridFiltersOnBlocksGridPage"/>
+        <grabTextFrom selector="{{AdminGridHeaders.totalRecords}}" stepKey="grabTotalRecordsBlocksBeforeClickSearchButton"/>
+        <click selector="{{AdminDataGridHeaderSection.submitSearch}}" stepKey="clickSearchMagnifierButtonOnBlocksGridPage"/>
+        <grabTextFrom selector="{{AdminGridHeaders.totalRecords}}" stepKey="grabTotalRecordsBlocksAfterClickSearchButton"/>
+        <assertEquals stepKey="assertTotalRecordsBlocks">
+            <expectedResult type="string">$grabTotalRecordsBlocksBeforeClickSearchButton</expectedResult>
+            <actualResult type="string">$grabTotalRecordsBlocksAfterClickSearchButton</actualResult>
+        </assertEquals>
+        <actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="enterNonExistentEntityInQuickSearchOnBlocksGridPage">
+            <argument name="keyword" value="TestQueryNonExistentEntity"/>
+        </actionGroup>
+        <dontSeeElement selector="{{AdminDataGridTableSection.rows}}" stepKey="dontSeeResultRowsOnBlocksGrid"/>
+        <actionGroup ref="AdminAssertNumberOfRecordsInUiGridActionGroup" stepKey="assertNumberOfRecordsAfterFilteringNonExistentCmsBlock">
+            <argument name="number" value="0"/>
+        </actionGroup>
+        <actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="searchThirdCmsBlock">
+            <argument name="keyword" value="$createThirdCmsBlock.title$"/>
+        </actionGroup>
+        <see userInput="$createThirdCmsBlock.title$" selector="{{AdminGridRow.rowOne}}" stepKey="seeThirdCmsBlockAfterFiltering"/>
+        <actionGroup ref="AdminAssertNumberOfRecordsInUiGridActionGroup" stepKey="assertNumberOfRecordsAfterFilteringThirdBlock"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminAssertNumberOfRecordsInUiGridActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminAssertNumberOfRecordsInUiGridActionGroup.xml
@@ -0,0 +1,20 @@
+<?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="AdminAssertNumberOfRecordsInUiGridActionGroup">
+        <annotations>
+            <description>Validates that the Number of Records listed on the Ui grid page is present and correct.</description>
+        </annotations>
+        <arguments>
+            <argument name="number" type="string" defaultValue="1"/>
+        </arguments>
+        <see userInput="{{number}} records found" selector="{{AdminGridHeaders.totalRecords}}" stepKey="seeRecords"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminGridControlsSection/AdminGridHeadersSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminGridControlsSection/AdminGridHeadersSection.xml
@@ -11,5 +11,6 @@
         <element name="title" type="text" selector=".page-title-wrapper h1"/>
         <element name="headerByName" type="text" selector="//div[@data-role='grid-wrapper']//span[@class='data-grid-cell-content' and contains(text(), '{{var1}}')]/parent::*" parameterized="true"/>
         <element name="columnsNames" type="text" selector="[data-role='grid-wrapper'] .data-grid-th &gt; span"/>
+        <element name="totalRecords" type="text" selector="div.admin__data-grid-header-row.row.row-gutter div.row div.admin__control-support-text"/>
     </section>
 </sections>