Skip to content

Commit d2a4c49

Browse files
anthoulaanthoula
committed
Merge branch 'develop-php74' of github.com:magento/magento2-page-builder into PB-512
2 parents 7840e9e + e6fb492 commit d2a4c49

File tree

39 files changed

+181
-164
lines changed

39 files changed

+181
-164
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
<actualResult type="variable">$fallbackImageSource</actualResult>
2727
</assertRegExp>
2828
<grabAttributeFrom selector="{{section.videoBackgroundFallbackImageSource(index, fallbackImage.fileName)}}" userInput="style" stepKey="fallbackImageStyle"/>
29-
<assertContains stepKey="assertCover">
29+
<assertStringContainsString stepKey="assertCover">
3030
<expectedResult type="string">display: block;</expectedResult>
3131
<actualResult type="variable">$fallbackImageStyle</actualResult>
32-
</assertContains>
32+
</assertStringContainsString>
3333
</actionGroup>
3434
</actionGroups>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
<actualResult type="variable">$fallbackImageSource</actualResult>
2727
</assertRegExp>
2828
<grabAttributeFrom selector="{{section.videoBackgroundFallbackImageSource(index, fallbackImage.fileName)}}" userInput="style" stepKey="fallbackImageStyle"/>
29-
<assertContains stepKey="assertCover">
29+
<assertStringContainsString stepKey="assertCover">
3030
<expectedResult type="string">object-fit: cover;</expectedResult>
3131
<actualResult type="variable">$fallbackImageStyle</actualResult>
32-
</assertContains>
32+
</assertStringContainsString>
3333
</actionGroup>
3434
</actionGroups>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
<annotations>
1212
<description>Validates all video background attributes when all attributes are configured and parallax is enabled. Extends: validateVideoBackgroundWithAllAttributes</description>
1313
</annotations>
14-
<assertContains stepKey="assertVideoPosition">
14+
<assertStringContainsString stepKey="assertVideoPosition">
1515
<expectedResult type="string">position: fixed;</expectedResult>
1616
<actualResult type="variable">$videoStyle</actualResult>
17-
</assertContains>
18-
<assertContains stepKey="assertImagePosition">
17+
</assertStringContainsString>
18+
<assertStringContainsString stepKey="assertImagePosition">
1919
<expectedResult type="string">position: fixed;</expectedResult>
2020
<actualResult type="variable">$fallbackImageStyle</actualResult>
21-
</assertContains>
21+
</assertStringContainsString>
2222
</actionGroup>
2323
</actionGroups>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<annotations>
1212
<description>Validates that the video in the video background is finished playing.</description>
1313
</annotations>
14-
<assertContains stepKey="assertFallbackImageNotDisplayed">
14+
<assertStringContainsString stepKey="assertFallbackImageNotDisplayed">
1515
<expectedResult type="string">display: block;</expectedResult>
1616
<actualResult type="variable">$fallbackImageStyle</actualResult>
17-
</assertContains>
17+
</assertStringContainsString>
1818
</actionGroup>
1919
</actionGroups>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
<annotations>
1212
<description>Validates that the video in the video background is finished playing before it's in the viewport.</description>
1313
</annotations>
14-
<assertNotContains stepKey="assertVideoPlaying">
14+
<assertStringNotContainsString stepKey="assertVideoPlaying">
1515
<expectedResult type="string">transform: translate3d(</expectedResult>
1616
<actualResult type="variable">$videoStyle</actualResult>
17-
</assertNotContains>
18-
<assertContains stepKey="assertFallbackImageNotDisplayed">
17+
</assertStringNotContainsString>
18+
<assertStringContainsString stepKey="assertFallbackImageNotDisplayed">
1919
<expectedResult type="string">display: block;</expectedResult>
2020
<actualResult type="variable">$fallbackImageStyle</actualResult>
21-
</assertContains>
21+
</assertStringContainsString>
2222
</actionGroup>
2323
</actionGroups>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<annotations>
1212
<description>Validates that the video in the video background is loaded but not playing.</description>
1313
</annotations>
14-
<assertNotContains stepKey="assertVideoPlaying">
14+
<assertStringNotContainsString stepKey="assertVideoPlaying">
1515
<expectedResult type="string">transform: translate3d(</expectedResult>
1616
<actualResult type="variable">$videoStyle</actualResult>
17-
</assertNotContains>
17+
</assertStringNotContainsString>
1818
</actionGroup>
1919
</actionGroups>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
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>
1414
<waitForElement selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
15-
<assertNotContains stepKey="assertVideoPlaying">
15+
<assertStringNotContainsString stepKey="assertVideoPlaying">
1616
<expectedResult type="string">transform: translate3d(</expectedResult>
1717
<actualResult type="variable">$videoStyle</actualResult>
18-
</assertNotContains>
18+
</assertStringNotContainsString>
1919
</actionGroup>
2020
</actionGroups>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
<waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
2121
<waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
2222
<grabAttributeFrom selector="{{section.videoBackgroundVideoElement(index)}}" userInput="style" stepKey="videoStyle"/>
23-
<assertContains stepKey="assertVideoPlaying">
23+
<assertStringContainsString stepKey="assertVideoPlaying">
2424
<expectedResult type="string">transform: translate3d(</expectedResult>
2525
<actualResult type="variable">$videoStyle</actualResult>
26-
</assertContains>
26+
</assertStringContainsString>
2727
<waitForElement selector="{{section.videoBackgroundFallbackImage(index)}}|{{section.videoBackgroundNoFallbackImage(index)}}" stepKey="waitForFallbackImage"/>
2828
<grabAttributeFrom selector="{{section.videoBackgroundFallbackImage(index)}}|{{section.videoBackgroundNoFallbackImage(index)}}" userInput="style" stepKey="fallbackImageStyle"/>
29-
<assertContains stepKey="assertFallbackImageNotDisplayed">
29+
<assertStringContainsString stepKey="assertFallbackImageNotDisplayed">
3030
<expectedResult type="string">display: none;</expectedResult>
3131
<actualResult type="variable">$fallbackImageStyle</actualResult>
32-
</assertContains>
32+
</assertStringContainsString>
3333
</actionGroup>
3434
</actionGroups>

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,27 +33,27 @@
3333
<waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
3434
<waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
3535
<grabAttributeFrom selector="{{section.videoBackgroundJarallaxContainer(index)}}" userInput="style" stepKey="jarallaxStyle"/>
36-
<assertContains stepKey="assertHeight">
36+
<assertStringContainsString stepKey="assertHeight">
3737
<expectedResult type="string">height: 100%;</expectedResult>
3838
<actualResult type="variable">$jarallaxStyle</actualResult>
39-
</assertContains>
40-
<assertContains stepKey="assertWidth">
39+
</assertStringContainsString>
40+
<assertStringContainsString stepKey="assertWidth">
4141
<expectedResult type="string">width: 100%;</expectedResult>
4242
<actualResult type="variable">$jarallaxStyle</actualResult>
43-
</assertContains>
44-
<assertContains stepKey="assertOverflowHidden">
43+
</assertStringContainsString>
44+
<assertStringContainsString stepKey="assertOverflowHidden">
4545
<expectedResult type="string">overflow: hidden;</expectedResult>
4646
<actualResult type="variable">$jarallaxStyle</actualResult>
47-
</assertContains>
47+
</assertStringContainsString>
4848
<grabAttributeFrom selector="{{section.videoBackgroundVideoElement(index)}}" userInput="style" stepKey="videoStyle"/>
49-
<assertContains stepKey="assertVideoPosition">
49+
<assertStringContainsString stepKey="assertVideoPosition">
5050
<expectedResult type="string">position: absolute;</expectedResult>
5151
<actualResult type="variable">$videoStyle</actualResult>
52-
</assertContains>
53-
<assertContains stepKey="assertVideoPlaying">
52+
</assertStringContainsString>
53+
<assertStringContainsString stepKey="assertVideoPlaying">
5454
<expectedResult type="string">transform: translate3d(</expectedResult>
5555
<actualResult type="variable">$videoStyle</actualResult>
56-
</assertContains>
56+
</assertStringContainsString>
5757
<executeJS function="return window.getComputedStyle(document.evaluate(&quot;{{section.videoBackgroundOverlayElement(index)}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue).backgroundColor" stepKey="overlayColor"/>
5858
<assertEquals stepKey="assertOverlayColor">
5959
<expectedResult type="string">{{overlayColor}}</expectedResult>
@@ -70,13 +70,13 @@
7070
<actualResult type="variable">$fallbackImageSource</actualResult>
7171
</assertRegExp>
7272
<grabAttributeFrom selector="{{section.videoBackgroundFallbackImageSource(index, fallbackImage.fileName)}}" userInput="style" stepKey="fallbackImageStyle"/>
73-
<assertContains stepKey="assertImageCover">
73+
<assertStringContainsString stepKey="assertImageCover">
7474
<expectedResult type="string">object-fit: cover;</expectedResult>
7575
<actualResult type="variable">$fallbackImageStyle</actualResult>
76-
</assertContains>
77-
<assertContains stepKey="assertImagePosition">
76+
</assertStringContainsString>
77+
<assertStringContainsString stepKey="assertImagePosition">
7878
<expectedResult type="string">position: absolute;</expectedResult>
7979
<actualResult type="variable">$fallbackImageStyle</actualResult>
80-
</assertContains>
80+
</assertStringContainsString>
8181
</actionGroup>
8282
</actionGroups>

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,27 @@
2525
<waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
2626
<waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
2727
<grabAttributeFrom selector="{{section.videoBackgroundJarallaxContainer(index)}}" userInput="style" stepKey="jarallaxStyle"/>
28-
<assertContains stepKey="assertHeight">
28+
<assertStringContainsString stepKey="assertHeight">
2929
<expectedResult type="string">height: 100%;</expectedResult>
3030
<actualResult type="variable">$jarallaxStyle</actualResult>
31-
</assertContains>
32-
<assertContains stepKey="assertWidth">
31+
</assertStringContainsString>
32+
<assertStringContainsString stepKey="assertWidth">
3333
<expectedResult type="string">width: 100%;</expectedResult>
3434
<actualResult type="variable">$jarallaxStyle</actualResult>
35-
</assertContains>
36-
<assertContains stepKey="assertOverflowHidden">
35+
</assertStringContainsString>
36+
<assertStringContainsString stepKey="assertOverflowHidden">
3737
<expectedResult type="string">overflow: hidden;</expectedResult>
3838
<actualResult type="variable">$jarallaxStyle</actualResult>
39-
</assertContains>
39+
</assertStringContainsString>
4040
<grabAttributeFrom selector="{{section.videoBackgroundVideoElement(index)}}" userInput="style" stepKey="videoStyle"/>
41-
<assertContains stepKey="assertVideoPosition">
41+
<assertStringContainsString stepKey="assertVideoPosition">
4242
<expectedResult type="string">position: absolute;</expectedResult>
4343
<actualResult type="variable">$videoStyle</actualResult>
44-
</assertContains>
45-
<assertContains stepKey="assertVideoPlaying">
44+
</assertStringContainsString>
45+
<assertStringContainsString stepKey="assertVideoPlaying">
4646
<expectedResult type="string">transform: translate3d(</expectedResult>
4747
<actualResult type="variable">$videoStyle</actualResult>
48-
</assertContains>
48+
</assertStringContainsString>
4949
<dontSeeElementInDOM selector="{{section.videoBackgroundOverlayElement(index)}}" stepKey="dontSeeOverlayColorInDOM"/>
5050
<waitForElementVisible selector="{{section.videoBackgroundInfiniteLoop(index, infiniteLoop.value)}}" stepKey="waitForInfiniteLoop"/>
5151
<waitForElementVisible selector="{{section.videoBackgroundLazyLoad(index, lazyLoad.value)}}" stepKey="waitForLazyLoad"/>

0 commit comments

Comments
 (0)