Skip to content

Commit 744c48f

Browse files
dhaeckerdhaecker
committed
PB-425: Update Video Alignment MFTF Video Tests
- Fixing video alignment tests
1 parent f6e26ae commit 744c48f

9 files changed

+88
-40
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -464,15 +464,15 @@
464464
</arguments>
465465
<waitForPageLoad stepKey="waitForPageLoad"/>
466466
<waitForElement selector="{{section.videoBackgroundJarallaxContainer(index)}}" stepKey="waitForJarallaxContainer"/>
467-
<seeElement selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="seeVideoInDOM"/>
467+
<waitForElement selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideo"/>
468468
</actionGroup>
469469
<actionGroup name="validateVideoBackgroundNotLoaded" extends="validateVideoBackgroundLoaded">
470470
<annotations>
471471
<description>Validates that the video in the video background is not loaded.</description>
472472
</annotations>
473-
<dontSeeElementInDOM selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="seeVideoInDOM"/>
473+
<dontSeeElementInDOM selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideo"/>
474474
</actionGroup>
475-
<actionGroup name="validateVideoAspectRatio">
475+
<actionGroup name="validateVideoBackgroundVideoAspectRatio">
476476
<annotations>
477477
<description>Validates that the video in the video background has the correct aspect ratio.</description>
478478
</annotations>

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,16 @@
6565
</actionGroup>
6666
<actionGroup name="validateVideoAspectRatio">
6767
<annotations>
68-
<description>Validates that the video's aspect ratio in the video content type.</description>
68+
<description>Validates that the video in the video content type has the correct aspect ratio.</description>
6969
</annotations>
7070
<arguments>
7171
<argument name="page" defaultValue="VideoOnStage"/>
7272
<argument name="index" defaultValue="1" type="string"/>
7373
<argument name="acceptableOffset" defaultValue="2" type="string"/>
7474
</arguments>
75-
<waitForPageLoad stepKey="waitForPageLoad"/>
76-
<waitForElementVisible selector="{{page.videoElement(index)}}" stepKey="waitForVideoElement"/>
77-
<executeJS function="return window.calculatedHeight = parseInt(getComputedStyle(document.evaluate(&quot;{{page.videoElement(index)}}&quot;,document.body).iterateNext()).width) / 16 * 9" stepKey="calculatedHeight"/>
78-
<executeJS function="return window.actualHeight = parseInt(getComputedStyle(document.evaluate(&quot;{{page.videoElement(index)}}&quot;,document.body).iterateNext()).height)" stepKey="actualHeight"/>
75+
<waitForElementVisible selector="{{page.iframe(index)}}" stepKey="waitForVideoIFrame"/>
76+
<executeJS function="return window.calculatedHeight = parseInt(getComputedStyle(document.evaluate(&quot;{{page.iframe(index)}}&quot;,document.body).iterateNext()).width) / 16 * 9" stepKey="calculatedHeight"/>
77+
<executeJS function="return window.actualHeight = parseInt(getComputedStyle(document.evaluate(&quot;{{page.iframe(index)}}&quot;,document.body).iterateNext()).height)" stepKey="actualHeight"/>
7978
<executeJS function="return Math.abs(window.calculatedHeight - window.actualHeight)" stepKey="ratioDifference"/>
8079
<assertLessThanOrEqual stepKey="assertRatio">
8180
<expectedResult type="int">{{acceptableOffset}}</expectedResult>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,15 +520,15 @@
520520
<data key="fieldName">video_source</data>
521521
<data key="value">https://obsessive-owls.s3.us-east-2.amazonaws.com/MFTF/avocado.mp4</data>
522522
<data key="renderedValue">https://obsessive-owls.s3.us-east-2.amazonaws.com/MFTF/avocado.mp4</data>
523+
<data key="width">320px</data>
524+
<data key="height">320px</data>
523525
</entity>
524526
<entity name="PageBuilderVideoBackgroundUrl_Mp4_URL_Insecure" type="pagebuilder_video_background_url">
525527
<data key="name">Video URL</data>
526528
<data key="section">background</data>
527529
<data key="fieldName">video_source</data>
528530
<data key="value">http://obsessive-owls.s3.us-east-2.amazonaws.com/MFTF/avocado.mp4</data>
529531
<data key="renderedValue">http://obsessive-owls.s3.us-east-2.amazonaws.com/MFTF/avocado.mp4</data>
530-
<data key="width">320px</data>
531-
<data key="height">320px</data>
532532
</entity>
533533
<entity name="PageBuilderVideoBackgroundUrl_Invalid_Text" type="pagebuilder_video_background_url">
534534
<data key="name">Video URL</data>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@
8585
<data key="fieldName">video_source</data>
8686
<data key="value">https://obsessive-owls.s3.us-east-2.amazonaws.com/MFTF/avocado.mp4</data>
8787
<data key="renderedValue">https://obsessive-owls.s3.us-east-2.amazonaws.com/MFTF/avocado.mp4</data>
88+
<data key="width">320px</data>
89+
<data key="height">320px</data>
8890
</entity>
8991
<entity name="PageBuilderVideoUrl_Mp4_URL_Insecure" type="pagebuilder_video_url_property">
9092
<data key="name">Video URL</data>
9193
<data key="section">general</data>
9294
<data key="fieldName">video_source</data>
9395
<data key="value">http://obsessive-owls.s3.us-east-2.amazonaws.com/MFTF/avocado.mp4</data>
9496
<data key="renderedValue">http://obsessive-owls.s3.us-east-2.amazonaws.com/MFTF/avocado.mp4</data>
95-
<data key="width">320px</data>
96-
<data key="height">320px</data>
9797
</entity>
9898
<!-- Width -->
9999
<entity name="PageBuilderVideoWidth_Empty" type="pagebuilder_video_width_property">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<element name="iframePlaying" type="text" selector="//div[@id='player']//div[contains(@class,'playing-mode')]"/>
3030
<element name="iframeNotAutoplaying" type="text" selector="//div[@id='player']//div[contains(@class, 'unstarted-mode')]"/>
3131
<element name="width" type="text" parameterized="true" selector="(//div[@data-content-type='video'])[{{videoIndex}}]//div[@data-element='inner'][contains(@style,'max-width: {{width}}px;')]"/>
32-
<element name="noWidth" type="text" parameterized="true" selector="(//div[@data-content-type='video'])[{{videoIndex}}]//div[@data-element='inner'][not(starts-with(@style,'width:')) and not(contains(@style,' width:'))][contains(@class,'pagebuilder-video-wrapper')]"/>
32+
<element name="noWidth" type="text" parameterized="true" selector="(//div[@data-content-type='video'])[{{videoIndex}}]//div[@data-element='inner'][not(starts-with(@style,'max-width:')) and not(contains(@style,' max-width:'))]"/>
3333
<!-- Advanced Configuration -->
3434
<element name="alignment" type="text" parameterized="true" selector="(//div[@data-content-type='video'])[{{videoIndex}}][contains(@style,'text-align: {{alignment}};')]"/>
3535
<element name="noAlignment" type="text" parameterized="true" selector="(//div[@data-content-type='video'])[{{videoIndex}}][not(contains(@style,'text-align:'))]"/>
@@ -62,7 +62,7 @@
6262
<element name="iframePlaying" type="text" selector="//div[@id='player']/div[contains(@class,'playing-mode')]"/>
6363
<element name="iframeNotAutoplaying" type="text" selector="//div[@id='player']//div[contains(@class,'unstarted-mode')]"/>
6464
<element name="width" type="text" parameterized="true" selector="(//div[@data-content-type='video'])[{{videoIndex}}]//div[@data-element='inner'][contains(@style,'max-width: {{width}}')]"/>
65-
<element name="noWidth" type="text" parameterized="true" selector="(//div[@data-content-type='video'])[{{videoIndex}}]//div[@data-element='inner'][not(starts-with(@style,'width:')) and not(contains(@style,' width:'))]"/>
65+
<element name="noWidth" type="text" parameterized="true" selector="(//div[@data-content-type='video'])[{{videoIndex}}]//div[@data-element='inner'][not(starts-with(@style,'max-width:')) and not(contains(@style,' max-width:'))]"/>
6666
<!-- Advanced Configuration -->
6767
<element name="alignment" type="text" parameterized="true" selector="(//div[@data-content-type='video'])[{{videoIndex}}][contains(@style,'text-align: {{alignment}};')]"/>
6868
<element name="noAlignment" type="text" parameterized="true" selector="(//div[@data-content-type='video'])[{{videoIndex}}][not(contains(@style,'text-align'))]"/>

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3442,50 +3442,49 @@
34423442
<argument name="property" value="PageBuilderAppearance_CollageRight"/>
34433443
</actionGroup>
34443444
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings4"/>
3445-
<executeJS function="return parseInt(&quot;{{PageBuilderVideoBackgroundUrl_Mp4_URL_Insecure.width}}&quot;) / parseInt(&quot;{{PageBuilderVideoBackgroundUrl_Mp4_URL_Insecure.height}}&quot;)" stepKey="expectedVideoAspectRatio"/>
3445+
<executeJS function="return parseInt(&quot;{{PageBuilderVideoBackgroundUrl_Mp4_URL.width}}&quot;) / parseInt(&quot;{{PageBuilderVideoBackgroundUrl_Mp4_URL.height}}&quot;)" stepKey="expectedVideoAspectRatio"/>
34463446
<!-- Validate Stage -->
3447-
<actionGroup ref="validateVideoAspectRatio" stepKey="validateVideoAspectRatioBanner1Stage">
3447+
<actionGroup ref="validateVideoBackgroundVideoAspectRatio" stepKey="validateVideoAspectRatioBanner1Stage">
34483448
<argument name="section" value="BannerOnBackend"/>
34493449
<argument name="expectedRatio" value="{$expectedVideoAspectRatio}"/>
34503450
<argument name="index" value="1"/>
34513451
</actionGroup>
3452-
<actionGroup ref="validateVideoAspectRatio" stepKey="validateVideoAspectRatioBanner2Stage">
3452+
<actionGroup ref="validateVideoBackgroundVideoAspectRatio" stepKey="validateVideoAspectRatioBanner2Stage">
34533453
<argument name="section" value="BannerOnBackend"/>
34543454
<argument name="expectedRatio" value="{$expectedVideoAspectRatio}"/>
34553455
<argument name="index" value="2"/>
34563456
</actionGroup>
3457-
<actionGroup ref="validateVideoAspectRatio" stepKey="validateVideoAspectRatioBanner3Stage">
3457+
<actionGroup ref="validateVideoBackgroundVideoAspectRatio" stepKey="validateVideoAspectRatioBanner3Stage">
34583458
<argument name="section" value="BannerOnBackend"/>
34593459
<argument name="expectedRatio" value="{$expectedVideoAspectRatio}"/>
34603460
<argument name="index" value="3"/>
34613461
</actionGroup>
3462-
<actionGroup ref="validateVideoAspectRatio" stepKey="validateVideoAspectRatioBanner4Stage">
3462+
<actionGroup ref="validateVideoBackgroundVideoAspectRatio" stepKey="validateVideoAspectRatioBanner4Stage">
34633463
<argument name="section" value="BannerOnBackend"/>
34643464
<argument name="expectedRatio" value="{$expectedVideoAspectRatio}"/>
34653465
<argument name="index" value="4"/>
34663466
</actionGroup>
34673467
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
34683468
<!-- Validate Storefront -->
3469-
<amOnUrl url="{{_ENV.MAGENTO_BASE_URL}}" stepKey="goBackToMagento"/>
34703469
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToStorefront">
34713470
<argument name="page" value="$$createCMSPage.identifier$$"/>
34723471
</actionGroup>
3473-
<actionGroup ref="validateVideoAspectRatio" stepKey="validateVideoAspectRatioBanner1Storefront">
3472+
<actionGroup ref="validateVideoBackgroundVideoAspectRatio" stepKey="validateVideoAspectRatioBanner1Storefront">
34743473
<argument name="section" value="BannerOnFrontend"/>
34753474
<argument name="expectedRatio" value="{$expectedVideoAspectRatio}"/>
34763475
<argument name="index" value="1"/>
34773476
</actionGroup>
3478-
<actionGroup ref="validateVideoAspectRatio" stepKey="validateVideoAspectRatioBanner2Storefront">
3477+
<actionGroup ref="validateVideoBackgroundVideoAspectRatio" stepKey="validateVideoAspectRatioBanner2Storefront">
34793478
<argument name="section" value="BannerOnFrontend"/>
34803479
<argument name="expectedRatio" value="{$expectedVideoAspectRatio}"/>
34813480
<argument name="index" value="2"/>
34823481
</actionGroup>
3483-
<actionGroup ref="validateVideoAspectRatio" stepKey="validateVideoAspectRatioBanner3Storefront">
3482+
<actionGroup ref="validateVideoBackgroundVideoAspectRatio" stepKey="validateVideoAspectRatioBanner3Storefront">
34843483
<argument name="section" value="BannerOnFrontend"/>
34853484
<argument name="expectedRatio" value="{$expectedVideoAspectRatio}"/>
34863485
<argument name="index" value="3"/>
34873486
</actionGroup>
3488-
<actionGroup ref="validateVideoAspectRatio" stepKey="validateVideoAspectRatioBanner4Storefront">
3487+
<actionGroup ref="validateVideoBackgroundVideoAspectRatio" stepKey="validateVideoAspectRatioBanner4Storefront">
34893488
<argument name="section" value="BannerOnFrontend"/>
34903489
<argument name="expectedRatio" value="{$expectedVideoAspectRatio}"/>
34913490
<argument name="index" value="4"/>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2272,17 +2272,17 @@
22722272
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings3"/>
22732273
<executeJS function="return parseInt(&quot;{{PageBuilderVideoBackgroundUrl_Mp4_URL_Insecure.width}}&quot;) / parseInt(&quot;{{PageBuilderVideoBackgroundUrl_Mp4_URL_Insecure.height}}&quot;)" stepKey="expectedVideoAspectRatio"/>
22742274
<!-- Validate Stage -->
2275-
<actionGroup ref="validateVideoAspectRatio" stepKey="validateVideoAspectRatioRow1Stage">
2275+
<actionGroup ref="validateVideoBackgroundVideoAspectRatio" stepKey="validateVideoAspectRatioRow1Stage">
22762276
<argument name="section" value="RowOnStage"/>
22772277
<argument name="expectedRatio" value="{$expectedVideoAspectRatio}"/>
22782278
<argument name="index" value="1"/>
22792279
</actionGroup>
2280-
<actionGroup ref="validateVideoAspectRatio" stepKey="validateVideoAspectRatioRow2Stage">
2280+
<actionGroup ref="validateVideoBackgroundVideoAspectRatio" stepKey="validateVideoAspectRatioRow2Stage">
22812281
<argument name="section" value="RowOnStage"/>
22822282
<argument name="expectedRatio" value="{$expectedVideoAspectRatio}"/>
22832283
<argument name="index" value="2"/>
22842284
</actionGroup>
2285-
<actionGroup ref="validateVideoAspectRatio" stepKey="validateVideoAspectRatioRow3Stage">
2285+
<actionGroup ref="validateVideoBackgroundVideoAspectRatio" stepKey="validateVideoAspectRatioRow3Stage">
22862286
<argument name="section" value="RowOnStage"/>
22872287
<argument name="expectedRatio" value="{$expectedVideoAspectRatio}"/>
22882288
<argument name="index" value="3"/>
@@ -2292,17 +2292,17 @@
22922292
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToStorefront">
22932293
<argument name="page" value="$$createCMSPage.identifier$$"/>
22942294
</actionGroup>
2295-
<actionGroup ref="validateVideoAspectRatio" stepKey="validateVideoAspectRatioRow1Storefront">
2295+
<actionGroup ref="validateVideoBackgroundVideoAspectRatio" stepKey="validateVideoAspectRatioRow1Storefront">
22962296
<argument name="section" value="RowOnStorefront"/>
22972297
<argument name="expectedRatio" value="{$expectedVideoAspectRatio}"/>
22982298
<argument name="index" value="1"/>
22992299
</actionGroup>
2300-
<actionGroup ref="validateVideoAspectRatio" stepKey="validateVideoAspectRatioRow2Storefront">
2300+
<actionGroup ref="validateVideoBackgroundVideoAspectRatio" stepKey="validateVideoAspectRatioRow2Storefront">
23012301
<argument name="section" value="RowOnStorefront_FullWidth_FullBleed"/>
23022302
<argument name="expectedRatio" value="{$expectedVideoAspectRatio}"/>
23032303
<argument name="index" value="2"/>
23042304
</actionGroup>
2305-
<actionGroup ref="validateVideoAspectRatio" stepKey="validateVideoAspectRatioRow3Storefront">
2305+
<actionGroup ref="validateVideoBackgroundVideoAspectRatio" stepKey="validateVideoAspectRatioRow3Storefront">
23062306
<argument name="section" value="RowOnStorefront_FullWidth_FullBleed"/>
23072307
<argument name="expectedRatio" value="{$expectedVideoAspectRatio}"/>
23082308
<argument name="index" value="3"/>

0 commit comments

Comments
 (0)