Skip to content

Commit 55c4d4b

Browse files
omiroshnichenkoomiroshnichenko
authored
Merge pull request #484 from magento/develop-php74
PB-492: Upgrade Page Builder to make compatible with PHP 7.4
2 parents 96c714f + e6fb492 commit 55c4d4b

File tree

50 files changed

+202
-185
lines changed

Some content is hidden

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

50 files changed

+202
-185
lines changed

‎app/code/Magento/CatalogPageBuilderAnalytics/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"magento/module-page-builder-analytics": "*",
99
"magento/module-catalog": "*",
1010
"magento/framework": "*",
11-
"php": "~7.1.3||~7.2.0||~7.3.0"
11+
"php": "~7.3.0||~7.4.0"
1212
},
1313
"type": "magento2-module",
1414
"license": [

‎app/code/Magento/CmsPageBuilderAnalytics/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"magento/module-page-builder-analytics": "*",
99
"magento/module-cms": "*",
1010
"magento/framework": "*",
11-
"php": "~7.1.3||~7.2.0||~7.3.0"
11+
"php": "~7.3.0||~7.4.0"
1212
},
1313
"type": "magento2-module",
1414
"license": [

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

+2-2
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

+2-2
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

+4-4
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

+2-2
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

+4-4
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

+2-2
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

+2-2
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

+4-4
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

+14-14
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

+10-10
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"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/AddPageLinkWidgetToHtmlCodeWYSIWYGDisabledActionGroup.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<click selector="{{HtmlOnConfiguration.insertWidgetButton}}" stepKey="clickAddWidgetBtn"/>
1818
<waitForElementVisible selector="{{HtmlOnConfiguration.textarea}}" stepKey="waitForInsertWidgetModalToClose"/>
1919
<executeJS function="return document.querySelectorAll('{{HtmlOnConfiguration.textareaCSS}}')[0].value;" stepKey="getValueFromTextarea" after="waitForInsertWidgetModalToClose"/>
20-
<assertContains stepKey="assertTextareaContainsValue" after="getValueFromTextarea">
20+
<assertStringContainsString stepKey="assertTextareaContainsValue" after="getValueFromTextarea">
2121
<expectedResult type="string">{{widget.editPanelValue}}</expectedResult>
2222
<actualResult type="variable">getValueFromTextarea</actualResult>
23-
</assertContains>
23+
</assertStringContainsString>
2424
</actionGroup>
2525
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/AddVariableToHtmlCodeWYSIWYGDisabledActionGroup.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
<waitForElementNotVisible selector="{{VariableSection.InsertWidget}}" stepKey="waitForVariableModalToClose"/>
2323
<waitForElementVisible selector="{{HtmlOnConfiguration.textarea}}" stepKey="waitForTextArea"/>
2424
<executeJS function="return document.querySelectorAll('{{HtmlOnConfiguration.textareaCSS}}')[0].value;" stepKey="getValueFromTextarea"/>
25-
<assertContains stepKey="assertTextareaContainsValue">
25+
<assertStringContainsString stepKey="assertTextareaContainsValue">
2626
<expectedResult type="string">{{variable.editPanelValue}}</expectedResult>
2727
<actualResult type="variable">getValueFromTextarea</actualResult>
28-
</assertContains>
28+
</assertStringContainsString>
2929
</actionGroup>
3030
</actionGroups>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
<actualResult type="variable">ratioDifference</actualResult>
2828
</assertLessThanOrEqual>
2929
<grabAttributeFrom selector="{{page.iframe(index)}}" userInput="src" stepKey="videoSrc"/>
30-
<assertNotContains stepKey="assertNoAutoplay">
30+
<assertStringNotContainsString stepKey="assertNoAutoplay">
3131
<expectedResult type="string">autoplay</expectedResult>
3232
<actualResult type="variable">$videoSrc</actualResult>
33-
</assertNotContains>
33+
</assertStringNotContainsString>
3434
</actionGroup>
3535
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/ApplyGoogleMapsAPIKeyActionGroup.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<conditionalClick stepKey="expandAdvancedContentTools" selector="{{ContentManagementSection.PageBuilderOptions}}" dependentSelector="{{ContentManagementSection.CheckIfPageBuilderTabExpanded}}" visible="true"/>
1818
<waitForElementVisible selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" stepKey="waitForGoogleMapsAPIKeyInputField"/>
1919
<fillField selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" userInput="{{apiKey}}" stepKey="inputAPIKey"/>
20-
<pressKey selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" parameterArray="[\WebDriverKeys::ENTER]" stepKey="pressKey"/>
20+
<pressKey selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressKey"/>
2121
<click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/>
2222
<waitForPageLoad stepKey="waitForPageLoad3"/>
2323
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/InputGoogleMapsAPIKeyActionGroup.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
<comment userInput="inputGoogleMapsAPIKey" stepKey="comment"/>
1515
<waitForElementVisible selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" stepKey="waitForGoogleMapsAPIKeyInputField"/>
1616
<fillField selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" userInput="{{apiKey}}" stepKey="inputAPIKey"/>
17-
<pressKey selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" parameterArray="[\WebDriverKeys::ENTER]" stepKey="pressKey"/>
17+
<pressKey selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressKey"/>
1818
</actionGroup>
1919
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkVariableWYSIWYGDisabledActionGroup.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
<waitForElementNotVisible selector="{{VariableSection.InsertWidget}}" stepKey="waitForVariableModalToClose"/>
2222
<waitForElementVisible selector="{{TextOnConfiguration.textArea}}" stepKey="waitForTextArea"/>
2323
<executeJS function="return document.getElementById('{{TextOnConfiguration.textAreaId}}').value;" stepKey="getText"/>
24-
<assertContains stepKey="assertValue">
24+
<assertStringContainsString stepKey="assertValue">
2525
<expectedResult type="string">{{variable.editPanelValue}}</expectedResult>
2626
<actualResult type="variable">getText</actualResult>
27-
</assertContains>
27+
</assertStringContainsString>
2828
</actionGroup>
2929
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkWidgetWYSIWYGDisabledActionGroup.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<click selector="{{TextOnConfiguration.insertWidgetButton}}" stepKey="clickAddWidgetBtn"/>
1818
<waitForElementVisible selector="{{TextOnConfiguration.textArea}}" stepKey="waitForInsertWidgetModalToClose"/>
1919
<executeJS function="return document.getElementById('{{TextOnConfiguration.textAreaId}}').value;" stepKey="getText"/>
20-
<assertContains stepKey="assertValue">
20+
<assertStringContainsString stepKey="assertValue">
2121
<expectedResult type="string">{{widget.editPanelValue}}</expectedResult>
2222
<actualResult type="variable">getText</actualResult>
23-
</assertContains>
23+
</assertStringContainsString>
2424
</actionGroup>
2525
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AssertTextareaContainsValueActionGroup.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<argument name="value" type="string"/>
1414
</arguments>
1515
<executeJS function="return document.evaluate(&quot;{{selector}}&quot;, document.body).iterateNext().value" stepKey="textareaValue"/>
16-
<assertContains stepKey="assertTextareaContainsValue">
16+
<assertStringContainsString stepKey="assertTextareaContainsValue">
1717
<expectedResult type="string">{{value}}</expectedResult>
1818
<actualResult type="variable">textareaValue</actualResult>
19-
</assertContains>
19+
</assertStringContainsString>
2020
</actionGroup>
2121
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminCreateCmsBlockWithMarginalSpaceTest.xml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminCreateCmsBlockWithMarginalSpaceTest">
12+
<before>
13+
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="loginGetFromGeneralFile"/>
14+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
15+
</before>
16+
<after>
17+
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" before="adminLogout"/>
18+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
19+
</after>
20+
</test>
21+
</tests>

0 commit comments

Comments
 (0)