Skip to content

Commit a1d183b

Browse files
paras89paras89
committed
Merge branch 'develop' of github.com:magento/magento2-page-builder into column-group-story
2 parents a165c04 + 7e914ee commit a1d183b

File tree

457 files changed

+643
-67
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

457 files changed

+643
-67
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateFallbackImageAfterVideoFinishesPlayingInVideoBackgroundActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
</arguments>
1919
<waitForPageLoad stepKey="waitForPageLoad"/>
2020
<waitForElementVisible selector="{{section.backgroundType(index, 'video')}}" stepKey="waitForVideoBackground"/>
21+
<wait time="5" stepKey="waitToPreventVideoFlakiness"/>
2122
<waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideo"/>
2223
<waitForElementVisible selector="{{section.videoBackgroundFallbackImage(index)}}" stepKey="waitForFallbackImageVisible"/>
2324
<grabAttributeFrom selector="{{section.videoBackgroundFallbackImageSource(index, fallbackImage.fileName)}}" userInput="src" stepKey="fallbackImageSource"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoAspectRatioActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<argument name="index" defaultValue="1" type="string"/>
1818
<argument name="acceptableOffset" defaultValue="5" type="string"/>
1919
</arguments>
20+
<wait time="5" stepKey="waitToPreventVideoFlakiness"/>
2021
<waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoBackgroundElement"/>
2122
<executeJS function="return document.evaluate(&quot;{{section.videoBackgroundVideoElement(index)}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().width" stepKey="actualVideoWidth"/>
2223
<executeJS function="return document.evaluate(&quot;{{section.videoBackgroundVideoElement(index)}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="actualVideoHeight"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedButNotPlayingForNotVisibleElementActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<annotations>
1212
<description>Validates that the video in the video background is loaded but not playing for an element that is not visible.</description>
1313
</annotations>
14+
<wait time="5" stepKey="waitToPreventVideoFlakiness"/>
1415
<waitForElement selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
1516
<assertStringNotContainsString stepKey="assertVideoPlaying">
1617
<expectedResult type="string">transform: translate3d(</expectedResult>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundPlayingActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<argument name="index" defaultValue="1" type="string"/>
1818
</arguments>
1919
<waitForPageLoad stepKey="waitForPageLoad"/>
20+
<wait time="5" stepKey="waitToPreventVideoFlakiness"/>
2021
<waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
2122
<waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
2223
<grabAttributeFrom selector="{{section.videoBackgroundVideoElement(index)}}" userInput="style" stepKey="videoStyle"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundWithAllAttributesActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<expectedResult type="string">{{backgroundColor}}</expectedResult>
3131
<actualResult type="variable">$backgroundColor</actualResult>
3232
</assertEquals>
33+
<wait time="5" stepKey="waitToPreventVideoFlakiness"/>
3334
<waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
3435
<waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
3536
<grabAttributeFrom selector="{{section.videoBackgroundJarallaxContainer(index)}}" userInput="style" stepKey="jarallaxStyle"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundWithOnlyVideoUrlActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<expectedResult type="string">{{defaultBackgroundColor.rgb}}</expectedResult>
2828
<actualResult type="variable">grabBackgroundColorValue</actualResult>
2929
</assertEquals>
30+
<wait time="5" stepKey="waitToPreventVideoFlakiness"/>
3031
<waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
3132
<waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
3233
<grabAttributeFrom selector="{{section.videoBackgroundJarallaxContainer(index)}}" userInput="style" stepKey="jarallaxStyle"/>

‎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/ActionGroup/WYSIWYGActionGroup/InlineEditWYSIWYGFromStageActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<waitForElementVisible selector="{{PageBuilderStage.inlineWYSIWYGEditorPanel(contentType.role, index)}}" stepKey="waitForEditorPanel"/>
2121
<pressKey selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" userInput="{{content}}" stepKey="enterContentIntoEditor"/>
2222
<waitForPageLoad stepKey="waitForPageLoad"/>
23+
<waitForText userInput="{{content}}" stepKey="waitForContent"/>
2324
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocusFromEditor"/>
2425
</actionGroup>
2526
</actionGroups>

‎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/Data/BannerData.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,4 +235,18 @@
235235
<data key="value">rgba(174, 198, 207, 0.7)</data>
236236
<data key="rgb">rgba(174, 198, 207, 0.7)</data>
237237
</entity>
238+
<!-- Banner Alt Text -->
239+
<entity name="PageBuilderBannerAltTextProperty" type="pagebuilder_alt_text_property">
240+
<data key="name">Alternative Text</data>
241+
<data key="section">seo</data>
242+
<data key="fieldName">alt</data>
243+
<data key="value">This is alternative text.</data>
244+
</entity>
245+
<!-- Banner Title Attribute -->
246+
<entity name="PageBuilderBannerTitleAttributeProperty" type="pagebuilder_title_attribute_property">
247+
<data key="name">Title Attribute</data>
248+
<data key="section">seo</data>
249+
<data key="fieldName">title_attribute</data>
250+
<data key="value">This is a Title Attribute</data>
251+
</entity>
238252
</entities>

0 commit comments

Comments
 (0)