Merge remote-tracking branch 'commerce/develop' into platform-health

Author: xmav

app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductTotals.php

@@ -9,17 +9,16 @@
 namespace Magento\PageBuilder\Controller\Adminhtml\Form\Element;
 
 use Exception;
-use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
+use Magento\CatalogWidget\Controller\Adminhtml\Product\Widget;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\Result\JsonFactory;
 
 /**
  * Returns the number of products that match the provided conditions
  */
-class ProductTotals extends Action implements HttpPostActionInterface
+class ProductTotals extends Widget implements HttpPostActionInterface
 {
-    const ADMIN_RESOURCE = 'Magento_Catalog::products';
 
     /**
      * @var \Magento\PageBuilder\Model\Catalog\ProductTotals

app/code/Magento/PageBuilder/Test/Mftf/Data/BackgroundFormData.xml

@@ -211,6 +211,7 @@
         <data key="rgb">rgb(64, 127, 128)</data>
         <data key="hex">#407f80</data>
         <data key="rgbaCenterOfLightDarkSlider">rgba(64, 127, 128, 0.5)</data>
+        <data key="rgbaCenterOfLightDarkSliderRegex">^rgba\(64,\s*127,\s*128,\s*0.49(\d+)\)</data>
     </entity>
     <entity name="PageBuilderBackgroundColor_Invalid" type="pagebuilder_background_color_property">
         <data key="name">Background Color</data>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/EditPanelFormSection.xml

@@ -18,6 +18,7 @@
         <element name="panelFieldLabel" type="text" selector="//aside//div[@data-index=&quot;{{arg1}}&quot;]/descendant::div[@data-index=&quot;{{arg2}}&quot;]/descendant::label[not(contains(@style,&quot;display: none;&quot;))] | //aside//div[@data-index=&quot;{{arg3}}&quot;]/descendant::*[@class=&quot;admin__field-label&quot; or @class=&quot;title&quot;]/descendant::span[text()=&quot;{{arg4}}&quot;][not(ancestor::legend)]" parameterized="true"/>
         <element name="panelSectionChangedIcon" type="text" selector="[data-index='{{arg1}}'] ._changed .admin__page-nav-item-message-icon" parameterized="true"/>
         <element name="panelSectionError" type="text" selector="[data-index='{{arg1}}'] span._error .admin__page-nav-item-message-icon" parameterized="true"/>
+        <element name="panelSectionGenericError" type="text" selector="div.message.message-error.error"/>
         <element name="panelFieldControl" type="input" selector="//aside//div[@data-index=&quot;{{arg1}}&quot;]/descendant::*[@name=&quot;{{arg2}}&quot;]" parameterized="true"/>
         <element name="panelFieldControlCheckbox" type="input" selector="//input[@type='checkbox' and @name='{{arg1}}']" parameterized="true"/>
         <element name="panelFieldControlCheckboxState" type="input" selector="//input[@type='checkbox' and @name='{{arg1}}' and @value='{{arg2}}']" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/EditPanelColorPickerWindowFunctionalityTest.xml

@@ -74,8 +74,17 @@
         <!-- Validate Light/Dark Slider -->
         <comment userInput="Validate Light/Dark Slider" stepKey="commentLightDarkSlider"/>
         <click selector="{{ColorPicker.lightDarkSlider}}" stepKey="clickLightDarkSlider"/>
-        <waitForElementVisible selector="{{ColorPicker.panelColorSwatchColor(PageBuilderBackgroundColor_CenterColorHueSlider.section, PageBuilderBackgroundColor_CenterColorHueSlider.fieldName, PageBuilderBackgroundColor_CenterColorHueSlider.rgbaCenterOfLightDarkSlider)}}" stepKey="waitForColorSwatchColor4"/>
-        <seeInField selector="{{ColorPicker.inputField}}" userInput="{{PageBuilderBackgroundColor_CenterColorHueSlider.rgbaCenterOfLightDarkSlider}}" stepKey="seeColorInInputField4"/>
+        <waitForElementVisible selector="{{ColorPicker.panelColorSwatch(PageBuilderBackgroundColor_CenterColorHueSlider.section, PageBuilderBackgroundColor_CenterColorHueSlider.fieldName)}}" stepKey="waitForColorSwatchColor4"/>
+        <executeJS function="return window.getComputedStyle(document.evaluate(&quot;{{ColorPicker.panelColorSwatch(PageBuilderBackgroundColor_CenterColorHueSlider.section, PageBuilderBackgroundColor_CenterColorHueSlider.fieldName)}}//div&quot;, document.body).iterateNext()).backgroundColor" stepKey="grabBackgroundColorValue"/>
+        <assertRegExp stepKey="seeColorInSwatch">
+            <expectedResult type="string">/{{PageBuilderBackgroundColor_CenterColorHueSlider.rgbaCenterOfLightDarkSliderRegex}}/</expectedResult>
+            <actualResult type="variable">grabBackgroundColorValue</actualResult>
+        </assertRegExp>
+        <grabValueFrom selector="{{ColorPicker.inputField}}" stepKey="grabColorFromInput" />
+        <assertRegExp stepKey="seeColorInInputField4">
+            <expectedResult type="string">/{{PageBuilderBackgroundColor_CenterColorHueSlider.rgbaCenterOfLightDarkSliderRegex}}/</expectedResult>
+            <actualResult type="variable">grabColorFromInput</actualResult>
+        </assertRegExp>
         <!-- Validate Hex Input Field -->
         <comment userInput="Validate Hex Input Field" stepKey="commentHexInput"/>
         <fillField selector="{{ColorPicker.inputField}}" userInput="{{PageBuilderBackgroundColor_Plaintext_Green.value}}" stepKey="inputColorInInputField"/>