Skip to content

Commit 0c7dd63

Browse files
committed
Merge remote-tracking branch 'commerce/develop' into platform-health
2 parents 1ffb2ee + f223e97 commit 0c7dd63

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,16 @@
99
namespace Magento\PageBuilder\Controller\Adminhtml\Form\Element;
1010

1111
use Exception;
12-
use Magento\Backend\App\Action;
1312
use Magento\Backend\App\Action\Context;
13+
use Magento\CatalogWidget\Controller\Adminhtml\Product\Widget;
1414
use Magento\Framework\App\Action\HttpPostActionInterface;
1515
use Magento\Framework\Controller\Result\JsonFactory;
1616

1717
/**
1818
* Returns the number of products that match the provided conditions
1919
*/
20-
class ProductTotals extends Action implements HttpPostActionInterface
20+
class ProductTotals extends Widget implements HttpPostActionInterface
2121
{
22-
const ADMIN_RESOURCE = 'Magento_Catalog::products';
2322

2423
/**
2524
* @var \Magento\PageBuilder\Model\Catalog\ProductTotals

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@
211211
<data key="rgb">rgb(64, 127, 128)</data>
212212
<data key="hex">#407f80</data>
213213
<data key="rgbaCenterOfLightDarkSlider">rgba(64, 127, 128, 0.5)</data>
214+
<data key="rgbaCenterOfLightDarkSliderRegex">^rgba\(64,\s*127,\s*128,\s*0.49(\d+)\)</data>
214215
</entity>
215216
<entity name="PageBuilderBackgroundColor_Invalid" type="pagebuilder_background_color_property">
216217
<data key="name">Background Color</data>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<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"/>
1919
<element name="panelSectionChangedIcon" type="text" selector="[data-index='{{arg1}}'] ._changed .admin__page-nav-item-message-icon" parameterized="true"/>
2020
<element name="panelSectionError" type="text" selector="[data-index='{{arg1}}'] span._error .admin__page-nav-item-message-icon" parameterized="true"/>
21+
<element name="panelSectionGenericError" type="text" selector="div.message.message-error.error"/>
2122
<element name="panelFieldControl" type="input" selector="//aside//div[@data-index=&quot;{{arg1}}&quot;]/descendant::*[@name=&quot;{{arg2}}&quot;]" parameterized="true"/>
2223
<element name="panelFieldControlCheckbox" type="input" selector="//input[@type='checkbox' and @name='{{arg1}}']" parameterized="true"/>
2324
<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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,17 @@
7474
<!-- Validate Light/Dark Slider -->
7575
<comment userInput="Validate Light/Dark Slider" stepKey="commentLightDarkSlider"/>
7676
<click selector="{{ColorPicker.lightDarkSlider}}" stepKey="clickLightDarkSlider"/>
77-
<waitForElementVisible selector="{{ColorPicker.panelColorSwatchColor(PageBuilderBackgroundColor_CenterColorHueSlider.section, PageBuilderBackgroundColor_CenterColorHueSlider.fieldName, PageBuilderBackgroundColor_CenterColorHueSlider.rgbaCenterOfLightDarkSlider)}}" stepKey="waitForColorSwatchColor4"/>
78-
<seeInField selector="{{ColorPicker.inputField}}" userInput="{{PageBuilderBackgroundColor_CenterColorHueSlider.rgbaCenterOfLightDarkSlider}}" stepKey="seeColorInInputField4"/>
77+
<waitForElementVisible selector="{{ColorPicker.panelColorSwatch(PageBuilderBackgroundColor_CenterColorHueSlider.section, PageBuilderBackgroundColor_CenterColorHueSlider.fieldName)}}" stepKey="waitForColorSwatchColor4"/>
78+
<executeJS function="return window.getComputedStyle(document.evaluate(&quot;{{ColorPicker.panelColorSwatch(PageBuilderBackgroundColor_CenterColorHueSlider.section, PageBuilderBackgroundColor_CenterColorHueSlider.fieldName)}}//div&quot;, document.body).iterateNext()).backgroundColor" stepKey="grabBackgroundColorValue"/>
79+
<assertRegExp stepKey="seeColorInSwatch">
80+
<expectedResult type="string">/{{PageBuilderBackgroundColor_CenterColorHueSlider.rgbaCenterOfLightDarkSliderRegex}}/</expectedResult>
81+
<actualResult type="variable">grabBackgroundColorValue</actualResult>
82+
</assertRegExp>
83+
<grabValueFrom selector="{{ColorPicker.inputField}}" stepKey="grabColorFromInput" />
84+
<assertRegExp stepKey="seeColorInInputField4">
85+
<expectedResult type="string">/{{PageBuilderBackgroundColor_CenterColorHueSlider.rgbaCenterOfLightDarkSliderRegex}}/</expectedResult>
86+
<actualResult type="variable">grabColorFromInput</actualResult>
87+
</assertRegExp>
7988
<!-- Validate Hex Input Field -->
8089
<comment userInput="Validate Hex Input Field" stepKey="commentHexInput"/>
8190
<fillField selector="{{ColorPicker.inputField}}" userInput="{{PageBuilderBackgroundColor_Plaintext_Green.value}}" stepKey="inputColorInInputField"/>

0 commit comments

Comments
 (0)