Merge pull request #133 from magento-trigger/AC-109-combined

[TR] Upgrade jQuery and jsTree

Author: krissyhiserote

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

@@ -19,10 +19,10 @@
         <waitForElementVisible selector="{{buttonGroupPage.base(buttonGroupIndex)}}" stepKey="waitForButtonGroup"/>
         <waitForElementVisible selector="{{buttonGroupPage.appearance(buttonGroupIndex, PageBuilderButtonGroupAppearance_Stacked.value)}}" stepKey="seeButtonAppearance"/>
         <waitForElementVisible selector="{{buttonItemPage.base(firstButtonIndex)}}" stepKey="waitForButton1"/>
-        <executeJS function="return {{buttonItemPage.jsButtonSelector(firstButtonIndex)}}.getBoundingClientRect().x" stepKey="xCoordinate1"/>
+        <executeJS function="return Math.round({{buttonItemPage.jsButtonSelector(firstButtonIndex)}}.getBoundingClientRect().x)" stepKey="xCoordinate1"/>
         <executeJS function="return {{buttonItemPage.jsButtonSelector(firstButtonIndex)}}.getBoundingClientRect().y" stepKey="yCoordinate1"/>
         <waitForElementVisible selector="{{buttonItemPage.base(secondButtonIndex)}}" stepKey="waitForButton2"/>
-        <executeJS function="return {{buttonItemPage.jsButtonSelector(secondButtonIndex)}}.getBoundingClientRect().x" stepKey="xCoordinate2"/>
+        <executeJS function="return Math.round({{buttonItemPage.jsButtonSelector(secondButtonIndex)}}.getBoundingClientRect().x)" stepKey="xCoordinate2"/>
         <executeJS function="return {{buttonItemPage.jsButtonSelector(secondButtonIndex)}}.getBoundingClientRect().y" stepKey="yCoordinate2"/>
         <assertEquals stepKey="checkXCoordinates">
             <expectedResult type="variable">xCoordinate1</expectedResult>

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

@@ -207,11 +207,11 @@
         <data key="name">Background Color</data>
         <data key="section">background</data>
         <data key="fieldName">background_color</data>
-        <data key="value">#407f80</data>
-        <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>
+        <data key="value">#40807f</data>
+        <data key="rgb">rgb(64, 128, 127)</data>
+        <data key="hex">#40807f</data>
+        <data key="rgbaCenterOfLightDarkSlider">rgba(64, 128, 127, 0.5)</data>
+        <data key="rgbaCenterOfLightDarkSliderRegex">^rgba\(64,\s*128,\s*127,\s*0.49(\d+)\)</data>
     </entity>
     <entity name="PageBuilderBackgroundColor_Invalid" type="pagebuilder_background_color_property">
         <data key="name">Background Color</data>