Skip to content

Commit 53c6566

Browse files
cspruiellcspruiell
committed
PB-375: Align video background with embedded video
 - add test
1 parent 7bcc9e0 commit 53c6566

File tree

3 files changed

+72
-11
lines changed

3 files changed

+72
-11
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,17 @@
107107
</arguments>
108108
<waitForPageLoad stepKey="waitForPageLoad"/>
109109
<waitForElementVisible selector="{{page.videoElement(index)}}" stepKey="waitForVideoVisible"/>
110-
<!-- <waitForElement selector="{{page.videoBackgroundVideoUrl(index, url.renderedValue)}}" stepKey="waitForVideoUrl"/>-->
111110
<executeJS function="document.querySelector('[data-element=\'video\']').id = 'video-iframe'" stepKey="setIframeId"/>
112111
<switchToIFrame userInput="video-iframe" stepKey="switchToVideoIframe"/>
113112
<waitForElementVisible selector="{{page.iframePlaying(index)}}" stepKey="seeIframePlaying"/>
114113
<switchToIFrame stepKey="switchBackFromIframe"/>
115114
</actionGroup>
115+
<actionGroup name="validateVideoNotAutoplaying" extends="validateVideoPlaying">
116+
<annotations>
117+
<description>Validates that the video content type is not autoplaying.</description>
118+
</annotations>
119+
<waitForElementVisible selector="{{page.iframeNotAutoplaying(index)}}" stepKey="seeIframePlaying"/>
120+
</actionGroup>
116121
<actionGroup name="validateEmptyVideoStage">
117122
<arguments>
118123
<argument name="index" defaultValue="1" type="string"/>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<element name="src" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]//iframe[src]" parameterized="true"/>
2828
<element name="videoElement" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-video')])[{{videoIndex}}]//iframe|(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-video')])[{{videoIndex}}]//video" parameterized="true"/>
2929
<element name="iframePlaying" type="text" selector="(//div[@id='player'])[{{playerIndex}}]//div[contains(@class, 'playing-mode')]" parameterized="true"/>
30+
<element name="iframeNotAutoplaying" type="text" selector="(//div[@id='player'])[{{playerIndex}}]//div[contains(@class, 'unstarted-mode')]" parameterized="true"/>
3031
<element name="width" type="text" selector="(//div[contains(@class,'pagebuilder-video-inner')])[{{arg1}}][contains(@style,'max-width: {{arg2}}px;')]" parameterized="true"/>
3132
<element name="noWidth" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][not(starts-with(@style,'width:')) and not(contains(@style,' width:'))][contains(@class,'pagebuilder-video-wrapper')]" parameterized="true"/>
3233
<!-- Advanced Configuration -->
@@ -57,6 +58,7 @@
5758
<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"/>
5859
<element name="videoElement" type="text" parameterized="true" selector="(//div[@data-content-type='video'])[{{videoIndex}}]//iframe|(//div[@data-content-type='row'])[{{videoIndex}}]//video"/>
5960
<element name="iframePlaying" type="text" selector="(//div[@id='player'])[{{playerIndex}}]//div[contains(@class, 'playing-mode')]" parameterized="true"/>
61+
<element name="iframeNotAutoplaying" type="text" selector="(//div[@id='player'])[{{playerIndex}}]//div[contains(@class, 'unstarted-mode')]" parameterized="true"/>
6062
<!-- Advanced Configuration -->
6163
<element name="alignment" type="text" selector="(//div[@data-content-type='video'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
6264
<element name="noAlignment" type="text" selector="(//div[@data-content-type='video'])[{{arg1}}][not(contains(@style,'text-align'))]" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest.xml

Lines changed: 64 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1636,21 +1636,13 @@
16361636
</actionGroup>
16371637
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
16381638
<!-- Validate Stage -->
1639-
<actionGroup ref="validateVideoEmptyWidth" stepKey="validateStage">
1640-
<argument name="page" value="VideoOnStage"/>
1641-
<argument name="url" value="PageBuilderVideoUrl_YouTube"/>
1642-
</actionGroup>
16431639
<actionGroup ref="validateVideoPlaying" stepKey="validateVideoPlayingStage">
16441640
<argument name="page" value="VideoOnStage"/>
16451641
<argument name="url" value="PageBuilderVideoUrl_YouTube"/>
16461642
</actionGroup>
16471643
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
16481644
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
16491645
<!-- Validate Stage After Save -->
1650-
<actionGroup ref="validateVideoEmptyWidth" stepKey="validateStage2">
1651-
<argument name="page" value="VideoOnStage"/>
1652-
<argument name="url" value="PageBuilderVideoUrl_YouTube"/>
1653-
</actionGroup>
16541646
<actionGroup ref="validateVideoPlaying" stepKey="validateVideoPlayingStage2">
16551647
<argument name="page" value="VideoOnStage"/>
16561648
<argument name="url" value="PageBuilderVideoUrl_YouTube"/>
@@ -1668,11 +1660,73 @@
16681660
<argument name="contentType" value="PageBuilderVideoContentType"/>
16691661
</actionGroup>
16701662
<!-- Validate Storefront -->
1671-
<actionGroup ref="validateVideoEmptyWidth" stepKey="validateStorefront">
1663+
<actionGroup ref="validateVideoPlaying" stepKey="validateVideoPlayingStorefront">
16721664
<argument name="page" value="VideoOnStorefront"/>
16731665
<argument name="url" value="PageBuilderVideoUrl_YouTube"/>
16741666
</actionGroup>
1675-
<actionGroup ref="validateVideoPlaying" stepKey="validateVideoPlayingStorefront">
1667+
</test>
1668+
<test name="VideoValidateAutoplayDisabled">
1669+
<annotations>
1670+
<features value="PageBuilder"/>
1671+
<stories value="Video"/>
1672+
<title value="Validate Video Autoplay Attribute"/>
1673+
<description value="Validate that setting the autoplay attribute in the General form for Video will update the Stage and Storefront correctly."/>
1674+
<severity value="BLOCKER"/>
1675+
<useCaseId value="PB-375"/>
1676+
<testCaseId value="PB-424"/>
1677+
<group value="pagebuilder"/>
1678+
<group value="pagebuilder-video"/>
1679+
</annotations>
1680+
<before>
1681+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1682+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1683+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1684+
</before>
1685+
<after>
1686+
<actionGroup ref="logout" stepKey="logout"/>
1687+
</after>
1688+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1689+
<argument name="contentType" value="PageBuilderVideoContentType"/>
1690+
</actionGroup>
1691+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
1692+
<argument name="contentType" value="PageBuilderVideoContentType"/>
1693+
</actionGroup>
1694+
<actionGroup ref="dragContentTypeToStage" stepKey="dragVideoIntoStage">
1695+
<argument name="contentType" value="PageBuilderVideoContentType"/>
1696+
</actionGroup>
1697+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
1698+
<argument name="contentType" value="PageBuilderVideoContentType"/>
1699+
</actionGroup>
1700+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterVideoUrlProperty">
1701+
<argument name="property" value="PageBuilderVideoUrl_YouTube"/>
1702+
</actionGroup>
1703+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1704+
<!-- Validate Stage -->
1705+
<actionGroup ref="validateVideoNotAutoplaying" stepKey="validateVideoNotPlayingStage">
1706+
<argument name="page" value="VideoOnStage"/>
1707+
<argument name="url" value="PageBuilderVideoUrl_YouTube"/>
1708+
</actionGroup>
1709+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
1710+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1711+
<!-- Validate Stage After Save -->
1712+
<actionGroup ref="validateVideoNotAutoplaying" stepKey="validateVideoNotPlayingStage2">
1713+
<argument name="page" value="VideoOnStage"/>
1714+
<argument name="url" value="PageBuilderVideoUrl_YouTube"/>
1715+
</actionGroup>
1716+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
1717+
<argument name="contentType" value="PageBuilderVideoContentType"/>
1718+
</actionGroup>
1719+
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeVideoUrlInAdmin">
1720+
<argument name="property" value="PageBuilderVideoUrl_YouTube"/>
1721+
</actionGroup>
1722+
<actionGroup ref="seeOptionIsNotCheckedSlideOutProperty" stepKey="seeAutoplayDisabledAfterSave">
1723+
<argument name="property" value="PageBuilderVideoAutoplay_Disabled"/>
1724+
</actionGroup>
1725+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1726+
<argument name="contentType" value="PageBuilderVideoContentType"/>
1727+
</actionGroup>
1728+
<!-- Validate Storefront -->
1729+
<actionGroup ref="validateVideoNotAutoplaying" stepKey="validateVideoPlayingStorefront">
16761730
<argument name="page" value="VideoOnStorefront"/>
16771731
<argument name="url" value="PageBuilderVideoUrl_YouTube"/>
16781732
</actionGroup>

0 commit comments

Comments
 (0)