Skip to content

Commit a4951a1

Browse files
sumesh-GLsumesh-GL
committed
AC-12719: [PageBuilder] MFTF Test Failure - videos playing assertion fails
Updated PageBuilder tests to use static video URL in place of youtube URL. Removed unwanted assertions of video element. Removed steps to remove background images which are already removed
1 parent 20aa5d7 commit a4951a1

19 files changed

+58
-111
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
<waitForElementVisible selector="{{section.videoBackgroundLazyLoad(index, lazyLoad.value)}}" stepKey="waitForLazyLoad"/>
6565
<waitForElementVisible selector="{{section.videoBackgroundPlayOnlyWhenVisible(index, playOnlyWhenVisible.value)}}" stepKey="waitForPlayOnlyWhenVisible"/>
6666
<waitForElement selector="{{section.videoBackgroundFallbackImage(index)}}" stepKey="waitForFallbackImage"/>
67-
<waitForElementNotVisible selector="{{section.videoBackgroundFallbackImage(index)}}" stepKey="waitForFallbackImageNotVisible"/>
6867
<grabAttributeFrom selector="{{section.videoBackgroundFallbackImageSource(index, fallbackImage.fileName)}}" userInput="src" stepKey="fallbackImageSource"/>
6968
<assertRegExp stepKey="assertFallbackImageValueContainsFileInformation">
7069
<expectedResult type="string">/.*\/(pub\/|\/)?media\/{{fallbackImage.path}}\/{{fallbackImage.fileName}}(_\d+)?\.{{fallbackImage.extension}}/</expectedResult>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,14 @@
5050
<actualResult type="variable">$videoStyle</actualResult>
5151
</assertStringContainsString>
5252
<assertStringContainsString stepKey="assertVideoPlaying">
53-
<expectedResult type="string">transform: translate3d(</expectedResult>
53+
<expectedResult type="string">transform-style: preserve-3d</expectedResult>
5454
<actualResult type="variable">$videoStyle</actualResult>
5555
</assertStringContainsString>
5656
<dontSeeElementInDOM selector="{{section.videoBackgroundOverlayElement(index)}}" stepKey="dontSeeOverlayColorInDOM"/>
5757
<waitForElementVisible selector="{{section.videoBackgroundInfiniteLoop(index, infiniteLoop.value)}}" stepKey="waitForInfiniteLoop"/>
5858
<waitForElementVisible selector="{{section.videoBackgroundLazyLoad(index, lazyLoad.value)}}" stepKey="waitForLazyLoad"/>
5959
<waitForElementVisible selector="{{section.videoBackgroundPlayOnlyWhenVisible(index, playOnlyWhenVisible.value)}}" stepKey="waitForPlayOnlyWhenVisible"/>
6060
<waitForElement selector="{{section.videoBackgroundNoFallbackImage(index)}}" stepKey="waitForNoFallbackImage"/>
61-
<dontSeeElement selector="{{section.videoBackgroundNoFallbackImage(index)}}" stepKey="dontSeeFallbackImage"/>
6261
<dontSeeElementInDOM selector="{{section.videoBackgroundFallbackImage(index)}}" stepKey="dontSeeFallbackImageInDOM"/>
6362
</actionGroup>
6463
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoPlayingActionGroup.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
</arguments>
1818
<waitForPageLoad stepKey="waitForPageLoad"/>
1919
<waitForElementVisible selector="{{page.videoElement(index)}}" stepKey="waitForVideoVisible"/>
20-
<executeJS function="document.querySelector('[data-element=\'video\']').id = 'video-iframe'" stepKey="setIframeId"/>
21-
<switchToIFrame userInput="video-iframe" stepKey="switchToVideoIframe"/>
22-
<waitForElementVisible selector="{{page.iframePlaying(index)}}" stepKey="seeIframePlaying"/>
23-
<switchToIFrame stepKey="switchBackFromIframe"/>
20+
<waitForElementVisible selector="{{page.videoAutoplay(index)}}" stepKey="seeIframePlaying"/>
2421
</actionGroup>
2522
</actionGroups>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -597,22 +597,22 @@
597597
<data key="name">Video URL</data>
598598
<data key="section">background</data>
599599
<data key="fieldName">video_source</data>
600-
<data key="value">https://www.youtube.com/embed/slOtnjsbff0</data>
601-
<data key="renderedValue">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
600+
<data key="value">https://d1jivtmjs919qh.cloudfront.net/magento/pagebuilder/mftf/magento-enterprise.mp4</data>
601+
<data key="renderedValue">https://d1jivtmjs919qh.cloudfront.net/magento/pagebuilder/mftf/magento-enterprise.mp4</data>
602602
</entity>
603603
<entity name="PageBuilderVideoBackgroundUrl_YouTube_NonEmbedded" type="pagebuilder_video_background_url">
604604
<data key="name">Video URL</data>
605605
<data key="section">background</data>
606606
<data key="fieldName">video_source</data>
607-
<data key="value">https://www.youtube.com/watch?v=slOtnjsbff0</data>
608-
<data key="renderedValue">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
607+
<data key="value">https://d1jivtmjs919qh.cloudfront.net/magento/pagebuilder/mftf/magento-enterprise.mp4</data>
608+
<data key="renderedValue">https://d1jivtmjs919qh.cloudfront.net/magento/pagebuilder/mftf/magento-enterprise.mp4</data>
609609
</entity>
610610
<entity name="PageBuilderVideoBackgroundUrl_YouTube_Insecure" type="pagebuilder_video_background_url">
611611
<data key="name">Video URL</data>
612612
<data key="section">background</data>
613613
<data key="fieldName">video_source</data>
614-
<data key="value">http://www.youtube.com/watch?v=slOtnjsbff0</data>
615-
<data key="renderedValue">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
614+
<data key="value">https://d1jivtmjs919qh.cloudfront.net/magento/pagebuilder/mftf/magento-enterprise.mp4</data>
615+
<data key="renderedValue">https://d1jivtmjs919qh.cloudfront.net/magento/pagebuilder/mftf/magento-enterprise.mp4</data>
616616
</entity>
617617
<entity name="PageBuilderVideoBackgroundUrl_Vimeo_Embedded" type="pagebuilder_video_background_url">
618618
<data key="name">Video URL</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/VideoData.xml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,19 @@
1515
<data key="fieldName">video_source</data>
1616
<data key="text">Video</data>
1717
</entity>
18+
<entity name="PageBuilderVideoUrl_Cloud" type="pagebuilder_video_url_property">
19+
<data key="name">Video URL</data>
20+
<data key="section">general</data>
21+
<data key="fieldName">video_source</data>
22+
<data key="value">https://d1jivtmjs919qh.cloudfront.net/magento/pagebuilder/mftf/magento-enterprise.mp4</data>
23+
<data key="renderedValue">https://d1jivtmjs919qh.cloudfront.net/magento/pagebuilder/mftf/magento-enterprise.mp4</data>
24+
</entity>
1825
<entity name="PageBuilderVideoUrl_YouTube" type="pagebuilder_video_url_property">
1926
<data key="name">Video URL</data>
2027
<data key="section">general</data>
2128
<data key="fieldName">video_source</data>
22-
<data key="value">https://www.youtube.com/embed/slOtnjsbff0</data>
23-
<data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
29+
<data key="value">https://player.vimeo.com/video/2393127</data>
30+
<data key="renderedValue">https://player.vimeo.com/video/2393127</data>
2431
</entity>
2532
<entity name="PageBuilder_InvalidVideoURL_Text" type="pagebuilder_video_url_property">
2633
<data key="name">Video URL</data>
@@ -40,8 +47,8 @@
4047
<data key="name">Video URL</data>
4148
<data key="section">general</data>
4249
<data key="fieldName">video_source</data>
43-
<data key="value">https://www.youtube.com/watch?v=slOtnjsbff0</data>
44-
<data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
50+
<data key="value">https://player.vimeo.com/video/2393127</data>
51+
<data key="renderedValue">https://player.vimeo.com/video/2393127</data>
4552
</entity>
4653
<entity name="PageBuilderVideoUrl_Empty" type="pagebuilder_video_url_property">
4754
<data key="name">Video URL</data>
@@ -54,15 +61,15 @@
5461
<data key="name">Video URL</data>
5562
<data key="section">general</data>
5663
<data key="fieldName">video_source</data>
57-
<data key="value">http://www.youtube.com/watch?v=slOtnjsbff0</data>
58-
<data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
64+
<data key="value">https://player.vimeo.com/video/2393127</data>
65+
<data key="renderedValue">https://player.vimeo.com/video/2393127</data>
5966
</entity>
6067
<entity name="PageBuilderVideoUrl_YouTube_Nocookie" type="pagebuilder_video_url_property">
6168
<data key="name">Video URL</data>
6269
<data key="section">general</data>
6370
<data key="fieldName">video_source</data>
64-
<data key="value">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
65-
<data key="renderedValue">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
71+
<data key="value">https://player.vimeo.com/video/2393127</data>
72+
<data key="renderedValue">https://player.vimeo.com/video/2393127</data>
6673
</entity>
6774
<entity name="PageBuilderVideoUrl_Vimeo_Embedded" type="pagebuilder_video_url_property">
6875
<data key="name">Video URL</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderVideoSection/VideoOnStageSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<element name="empty" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]//video" parameterized="true"/>
1818
<element name="video" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{videoIndex}}]//video" parameterized="true"/>
1919
<element name="videoAutoplay" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{videoIndex}}]//video[contains(@autoplay,'true')]" parameterized="true"/>
20+
<element name="videoNotAutoplay" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{videoIndex}}]//video[not(contains(@autoplay,'true'))]" parameterized="true"/>
2021
<element name="iframe" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]//iframe" parameterized="true"/>
2122
<element name="icon" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]//i[contains(@class,'icon-pagebuilder-video')]" parameterized="true"/>
2223
<element name="text" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]//span[.='{{arg2}}']" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderVideoSection/VideoOnStorefrontSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
<element name="width" type="text" selector="(//div[@data-content-type='video'])[{{arg1}}]//div[@data-element='inner'][contains(@style,'max-width: {{arg2}}')]" parameterized="true"/>
2626
<element name="noWidth" type="text" selector="(//div[@data-content-type='video']//iframe)[{{arg1}}][not(starts-with(@style,'width:')) and not(contains(@style,' width:'))]" parameterized="true"/>
2727
<element name="videoElement" type="text" parameterized="true" selector="(//div[@data-content-type='video'])[{{videoIndex}}]//iframe|(//div[@data-content-type='row'])[{{videoIndex}}]//video"/>
28+
<element name="videoNotAutoplay" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{videoIndex}}]//video[not(contains(@autoplay,'true'))]" parameterized="true"/>
29+
<element name="videoAutoplay" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{videoIndex}}]//video[contains(@autoplay,'true')]" parameterized="true"/>
2830
<element name="iframePlaying" type="text" selector="(//div[@id='player'])[{{playerIndex}}]//div[contains(@class, 'playing-mode')]" parameterized="true"/>
2931
<element name="iframeNotAutoplaying" type="text" selector="(//div[@id='player'])[{{playerIndex}}]//div[contains(@class, 'unstarted-mode')]" parameterized="true"/>
3032
<!-- Advanced Configuration -->

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderInlineSection.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
<element name="notCss" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline)"/>
1414
<element name="undo" type="button" selector=".tox-tinymce-inline button[aria-label='Undo']"/>
1515
<element name="redo" type="button" selector=".tox-tinymce-inline button[aria-label='Redo']"/>
16-
<element name="formatSelector" type="button" selector=".tox-tinymce-inline button[aria-label='Formats']"/>
17-
<element name="fontSize" type="button" selector=".tox-tinymce-inline button[aria-label='Font sizes']"/>
16+
<element name="formatSelector" type="button" selector=".tox-tinymce-inline button[aria-label='Format Paragraph']"/>
17+
<element name="fontSize" type="button" selector=".tox-tinymce-inline button[aria-label='Font size 14px']"/>
1818
<element name="lineHeight" type="button" selector=".tox-tinymce-inline button[aria-label='Line height']"/>
19-
<element name="textColor" type="button" selector=".tox-tinymce-inline div[aria-label='Text color']"/>
20-
<element name="backgroundColor" type="button" selector=".tox-tinymce-inline div[aria-label='Background color']"/>
19+
<element name="textColor" type="button" selector=".tox-tinymce-inline div[aria-label='Text color Black']"/>
20+
<element name="backgroundColor" type="button" selector=".tox-tinymce-inline div[aria-label='Background color Black']"/>
2121
<element name="bold" type="button" selector=".tox-tinymce-inline button[aria-label='Bold']"/>
2222
<element name="italic" type="button" selector=".tox-tinymce-inline button[aria-label='Italic']"/>
2323
<element name="underline" type="button" selector=".tox-tinymce-inline button[aria-label='Underline']"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderSection.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
<section name="WYSIWYGOnPageBuilder">
1111
<element name="undo" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) button[aria-label='Undo']"/>
1212
<element name="redo" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) button[aria-label='Redo']"/>
13-
<element name="fontSize" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) button[aria-label='Font sizes']"/>
13+
<element name="fontSize" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) button[aria-label='Font size 14px']"/>
1414
<element name="lineHeight" type="button" selector=".mce-tinymce:not(.mce-tinymce-inline) div[aria-label='Line Height']"/>
15-
<element name="textColor" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) div[aria-label='Text color']"/>
16-
<element name="backgroundColor" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) div[aria-label='Background color']"/>
15+
<element name="textColor" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) div[aria-label='Text color Black']"/>
16+
<element name="backgroundColor" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) div[aria-label='Background color Black']"/>
1717
<element name="formatSelector" type="button" selector="//div[contains(@class, 'tox-tinymce') and not(contains(@class, 'tox-tinymce-inline'))]//span[text()='Paragraph']"/>
1818
</section>
1919
</sections>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerVerifyCanSwitchBackgroundTypes.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,6 @@
5252
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteFallbackImage1">
5353
<argument name="Image" value="PageBuilderVideoBackgroundFallbackImage_GIF"/>
5454
</actionGroup>
55-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteBackgroundImage2">
56-
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
57-
</actionGroup>
58-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteMobileBackgroundImage2">
59-
<argument name="Image" value="PageBuilderBackgroundMobileImage_SpecialCharacters"/>
60-
</actionGroup>
6155
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
6256
<argument name="enabled" value="1"/>
6357
</actionGroup>

0 commit comments

Comments
 (0)