From ca0e3a1b655fa0356e69d65bd163196562c72f14 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sat, 4 Apr 2020 22:31:13 +0200
Subject: [PATCH 1/2] magento/partners-magento2ee#171 Cover reported bug with
 MFTF tests

---
 .../AdminCmsPageUpdateTitleActionGroup.xml      | 17 +++++++++++++++++
 .../AdminAssertGridNotEmptyActionGroup.xml      | 14 ++++++++++++++
 ...AdminUiGridSelectFilterOptionActionGroup.xml | 12 ++++++++++++
 .../Mftf/Section/AdminDataGridFilterSection.xml |  1 +
 4 files changed, 44 insertions(+)
 create mode 100644 app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCmsPageUpdateTitleActionGroup.xml
 create mode 100644 app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminAssertGridNotEmptyActionGroup.xml
 create mode 100644 app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminUiGridSelectFilterOptionActionGroup.xml

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCmsPageUpdateTitleActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCmsPageUpdateTitleActionGroup.xml
new file mode 100644
index 0000000000000..0ae610a59e480
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCmsPageUpdateTitleActionGroup.xml
@@ -0,0 +1,17 @@
+<?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="AdminCmsPageSetTitleActionGroup">
+        <arguments>
+            <argument name="newTitle" type="string"/>
+        </arguments>
+
+        <fillField stepKey="fillNewTitle" selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{newTitle}}"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminAssertGridNotEmptyActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminAssertGridNotEmptyActionGroup.xml
new file mode 100644
index 0000000000000..7c951db99ef5e
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminAssertGridNotEmptyActionGroup.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="AdminAssertGridNotEmptyActionGroup">
+        <waitForLoadingMaskToDisappear stepKey="waitForGridLoaded"/>
+        <dontSee selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="expectNotEmptyGrid"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminUiGridSelectFilterOptionActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminUiGridSelectFilterOptionActionGroup.xml
new file mode 100644
index 0000000000000..99af4ae2f42e0
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminUiGridSelectFilterOptionActionGroup.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminUiGridSelectFilterOptionActionGroup">
+        <arguments>
+            <argument name="filterName" type="string"/>
+            <argument name="filterValue" type="string"/>
+        </arguments>
+        <selectOption selector="{{AdminDataGridFilterSection.selectByNameAttrInGrid(filterName)}}" userInput="{{filterValue}}" stepKey="selectOption"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridFilterSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridFilterSection.xml
index e93df2d26ffc4..ec4554be21510 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridFilterSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridFilterSection.xml
@@ -13,6 +13,7 @@
         <element name="filterExpand" type="button" selector="//div[@class='admin__data-grid-header'][(not(ancestor::*[@class='sticky-header']) and not(contains(@style,'visibility: hidden'))) or (ancestor::*[@class='sticky-header' and not(contains(@style,'display: none'))])]//button[@data-action='grid-filter-expand']" />
         <element name="inputFieldByNameAttr" type="input" selector="//*[@data-part='filter-form']//input[@name='{{inputNameAttr}}']" parameterized="true" />
         <element name="inputFieldByNameAttrInGrid" type="input" selector="//*[@data-role='filter-form']//input[@name='{{inputNameAttr}}']" parameterized="true"/>
+        <element name="selectByNameAttrInGrid" type="input" selector="//*[@data-role='filter-form']//select[@name='{{inputNameAttr}}']" parameterized="true"/>
         <element name="filterSelectFieldByName" type="select" selector="//*[@data-part='filter-form']//select[@name='{{fieldName}}']" parameterized="true"/>
         <element name="apply" type="button" selector="//*[@data-part='filter-form']//button[@data-action='grid-filter-apply']" />
         <element name="clear" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" />

From 1e226ffa0e382c73560eea23223d0c6a8e4d6f72 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sun, 5 Apr 2020 21:28:13 +0200
Subject: [PATCH 2/2] Add missing copyright

---
 .../AdminUiGridSelectFilterOptionActionGroup.xml            | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminUiGridSelectFilterOptionActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminUiGridSelectFilterOptionActionGroup.xml
index 99af4ae2f42e0..1c5a27ab326c3 100644
--- a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminUiGridSelectFilterOptionActionGroup.xml
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminUiGridSelectFilterOptionActionGroup.xml
@@ -1,4 +1,10 @@
 <?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">