Merge branch '322_Unskip_StorefrontProductListWidgetWithSharedCatalogTest' of https://github.com/magento/magento2 into pap-b2b-prs

Author: rganin

app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateCatalogProductsListWidgetActionGroup.xml

@@ -0,0 +1,40 @@
+<?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="AdminCreateCatalogProductsListWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
+        <annotations>
+            <description>EXTENDS: AdminCreateWidgetActionGroup. Creates a Product List Widget. Validates that the Success Message is present and correct.</description>
+        </annotations>
+        <arguments>
+            <argument name="title" defaultValue="" type="string"/>
+            <argument name="displayPageControl" defaultValue="0" type="string"/>
+            <argument name="numberOfProductsToDisplay" defaultValue="10" type="string"/>
+            <argument name="cacheLifetime" defaultValue="" type="string"/>
+            <argument name="condition" defaultValue="SKU" type="string"/>
+            <argument name="conditionsOperator" defaultValue="is one of" type="string"/>
+            <argument name="conditionParameter" defaultValue="" type="string"/>
+        </arguments>
+        <fillField selector="{{AdminNewWidgetSection.title}}" userInput="{{title}}" stepKey="fillTitleWidgetOption"/>
+        <selectOption selector="{{AdminNewWidgetSection.displayPageControl}}" userInput="{{displayPageControl}}" stepKey="selectDisplayPageControl"/>
+        <fillField selector="{{AdminNewWidgetSection.numberOfProductsToDisplay}}" userInput="{{numberOfProductsToDisplay}}" stepKey="fillNumberOfProductsToDisplay"/>
+        <fillField selector="{{AdminNewWidgetSection.cacheLifetime}}" userInput="{{cacheLifetime}}" stepKey="fillCacheLifetime"/>
+        <click selector="{{AdminNewWidgetSection.addNewCondition}}" stepKey="clickAddNewCondition"/>
+        <selectOption selector="{{AdminNewWidgetSection.selectCondition}}" userInput="{{condition}}" stepKey="selectCondition"/>
+        <waitForPageLoad stepKey="waitForConditionsOperator"/>
+        <click selector="{{AdminNewWidgetSection.conditionOperator}}" stepKey="clickConditionsOperator"/>
+        <selectOption selector="{{AdminNewWidgetSection.selectOperator}}" userInput="{{conditionsOperator}}" stepKey="selectConditionsOperator"/>
+        <click selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="clickConditionParameter"/>
+        <fillField selector="{{AdminNewWidgetSection.setRuleParameter}}" userInput="{{conditionParameter}}" stepKey="fillConditionParameter"/>
+        <click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="clickApplyCondition"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveWidget"/>
+        <waitForPageLoad stepKey="waitForSave"/>
+        <waitForText selector="{{AdminMessagesSection.success}}" userInput="The widget instance has been saved" stepKey="waitForSuccess"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateProductsListWidgetActionGroup.xml

@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminCreateProductsListWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
+    <actionGroup name="AdminCreateProductsListWidgetActionGroup" extends="AdminCreateWidgetActionGroup" deprecated="Use AdminCreateCatalogProductsListWidgetActionGroup instead">
         <annotations>
             <description>EXTENDS: AdminCreateWidgetActionGroup. Creates a Product List Widget. Validates that the Success Message is present and correct.</description>
         </annotations>

app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml

@@ -26,6 +26,8 @@
         <element name="widgetOptions" type="select" selector="#widget_instace_tabs_properties_section"/>
         <element name="addNewCondition" type="select" selector=".rule-param.rule-param-new-child"/>
         <element name="selectCondition" type="input" selector="#conditions__1__new_child"/>
+        <element name="conditionOperator" type="button" selector="#conditions__1__children>li:nth-child(1)>span:nth-child(3) a"/>
+        <element name="selectOperator" type="select" selector="#conditions__1__children>li:nth-child(1)>span:nth-child(3) select"/>
         <element name="ruleParameter" type="select" selector="#conditions__1__children>li:nth-child(1)>span:nth-child(4)>a"/>
         <element name="setRuleParameter" type="input" selector="#conditions__1--1__value"/>
         <element name="applyParameter" type="button" selector=".rule-param-apply"/>
@@ -40,5 +42,10 @@
         <element name="displayMode" type="select" selector="select[id*='display_mode']"/>
         <element name="restrictTypes" type="select" selector="select[id*='types']"/>
         <element name="saveAndContinue" type="button" selector="#save_and_edit_button" timeout="30"/>
+        <!-- Catalog Product List Widget Options -->
+        <element name="title" type="input" selector="[name='parameters[title]']"/>
+        <element name="displayPageControl" type="select" selector="[name='parameters[show_pager]']"/>
+        <element name="numberOfProductsToDisplay" type="input" selector="[name='parameters[products_count]']"/>
+        <element name="cacheLifetime" type="input" selector="[name='parameters[cache_lifetime]']"/>
     </section>
 </sections>