Skip to content

Commit 3c7b3f0

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into MQE-3009
# Conflicts: # app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsCannotAddToStageTest.xml
2 parents 3656761 + c662615 commit 3c7b3f0

File tree

4 files changed

+8
-55
lines changed

4 files changed

+8
-55
lines changed

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonGroupStackedAppearanceActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
<waitForElementVisible selector="{{buttonGroupPage.base(buttonGroupIndex)}}" stepKey="waitForButtonGroup"/>
2020
<waitForElementVisible selector="{{buttonGroupPage.appearance(buttonGroupIndex, PageBuilderButtonGroupAppearance_Stacked.value)}}" stepKey="seeButtonAppearance"/>
2121
<waitForElementVisible selector="{{buttonItemPage.base(firstButtonIndex)}}" stepKey="waitForButton1"/>
22-
<executeJS function="return {{buttonItemPage.jsButtonSelector(firstButtonIndex)}}.getBoundingClientRect().x" stepKey="xCoordinate1"/>
22+
<executeJS function="return Math.round({{buttonItemPage.jsButtonSelector(firstButtonIndex)}}.getBoundingClientRect().x)" stepKey="xCoordinate1"/>
2323
<executeJS function="return {{buttonItemPage.jsButtonSelector(firstButtonIndex)}}.getBoundingClientRect().y" stepKey="yCoordinate1"/>
2424
<waitForElementVisible selector="{{buttonItemPage.base(secondButtonIndex)}}" stepKey="waitForButton2"/>
25-
<executeJS function="return {{buttonItemPage.jsButtonSelector(secondButtonIndex)}}.getBoundingClientRect().x" stepKey="xCoordinate2"/>
25+
<executeJS function="return Math.round({{buttonItemPage.jsButtonSelector(secondButtonIndex)}}.getBoundingClientRect().x)" stepKey="xCoordinate2"/>
2626
<executeJS function="return {{buttonItemPage.jsButtonSelector(secondButtonIndex)}}.getBoundingClientRect().y" stepKey="yCoordinate2"/>
2727
<assertEquals stepKey="checkXCoordinates">
2828
<expectedResult type="variable">xCoordinate1</expectedResult>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,11 @@
207207
<data key="name">Background Color</data>
208208
<data key="section">background</data>
209209
<data key="fieldName">background_color</data>
210-
<data key="value">#407f80</data>
211-
<data key="rgb">rgb(64, 127, 128)</data>
212-
<data key="hex">#407f80</data>
213-
<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>
210+
<data key="value">#40807f</data>
211+
<data key="rgb">rgb(64, 128, 127)</data>
212+
<data key="hex">#40807f</data>
213+
<data key="rgbaCenterOfLightDarkSlider">rgba(64, 128, 127, 0.5)</data>
214+
<data key="rgbaCenterOfLightDarkSliderRegex">^rgba\(64,\s*128,\s*127,\s*0.49(\d+)\)</data>
215215
</entity>
216216
<entity name="PageBuilderBackgroundColor_Invalid" type="pagebuilder_background_color_property">
217217
<data key="name">Background Color</data>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsCannotAddToStageTest.xml

Lines changed: 0 additions & 47 deletions
This file was deleted.

app/code/Magento/PageBuilder/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"magento/module-require-js": "*",
2323
"magento/module-media-storage": "*",
2424
"php": "~7.4.0||~8.0.0",
25-
"phpgt/dom": "2.2.1"
25+
"phpgt/dom": "2.2.3"
2626
},
2727
"suggest": {
2828
"magento/module-review": "*"

0 commit comments

Comments
 (0)