Skip to content

Commit 4865483

Browse files
committed
MC-3870: Background does not conform to border radius for banner, image, contained row & video
Rename ImageOnStage to ImageOnStageWithoutImageUploaded
1 parent 4f18371 commit 4865483

File tree

6 files changed

+50
-50
lines changed

6 files changed

+50
-50
lines changed

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<argument name="property"/>
1313
</arguments>
1414
<comment userInput="Attach image A to PageBuilder stage" stepKey="commentAttach"/>
15-
<attachFile userInput="{{property.value}}" selector="{{ImageOnStage.attachImageBtn}}" stepKey="attachImageFileOnStage"/>
15+
<attachFile userInput="{{property.value}}" selector="{{ImageOnStageWithoutImageUploaded.attachImageBtn}}" stepKey="attachImageFileOnStage"/>
1616
<waitForPageLoad stepKey="waitForPageLoad"/>
17-
<waitForElementVisible selector="{{ImageOnStage.imagePreview}}" stepKey="waitForImagePreview"/>
18-
<waitForElementVisible selector="{{ImageOnStage.imageSourceOnStage(property.fileName)}}" stepKey="waitForImageSource"/>
17+
<waitForElementVisible selector="{{ImageOnStageWithoutImageUploaded.imagePreview}}" stepKey="waitForImagePreview"/>
18+
<waitForElementVisible selector="{{ImageOnStageWithoutImageUploaded.imageSourceOnStage(property.fileName)}}" stepKey="waitForImageSource"/>
1919
</actionGroup>
2020
<actionGroup name="verifyImageOnSlideout">
2121
<arguments>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11-
<section name="ImageOnStage">
11+
<section name="ImageOnStageWithoutImageUploaded">
1212
<element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]" parameterized="true"/>
1313
<element name="hidden" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and contains(@class, 'pagebuilder-content-type-hidden')]" parameterized="true"/>
1414
<element name="notHidden" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and not(contains(@class, 'pagebuilder-content-type-hidden'))][1]" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
<expectedResult type="string">{{PageBuilderBoxShadowProperty_No_Box_Shadow.value}}</expectedResult>
215215
<actualResult type="variable">getDefaultImageBoxShadowStyle</actualResult>
216216
</assertEquals>
217-
<moveMouseOver selector="{{ImageOnStage.base('1')}}" stepKey="moveMouseOverImage"/>
217+
<moveMouseOver selector="{{ImageOnStageWithoutImageUploaded.base('1')}}" stepKey="moveMouseOverImage"/>
218218
<waitForPageLoad stepKey="waitForImageHoverAnimation"/>
219219
<executeJS function="return window.getComputedStyle(document.querySelector('.pagebuilder-image'),null).getPropertyValue('box-shadow')" stepKey="getDefaultImageHoverBoxShadowStyle"/>
220220
<assertEquals stepKey="assertDefaultImageHoverBoxShadowStyle" message="pass">
@@ -1686,7 +1686,7 @@
16861686
<actionGroup ref="addImageToStage" stepKey="addImageToStage">
16871687
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
16881688
</actionGroup>
1689-
<waitForElementVisible selector="{{ImageOnStage.imageSourceByIndex('1', PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="seeImage1SourceOnStage"/>
1689+
<waitForElementVisible selector="{{ImageOnStageWithoutImageUploaded.imageSourceByIndex('1', PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="seeImage1SourceOnStage"/>
16901690
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
16911691
<argument name="contentType" value="PageBuilderTextContentType"/>
16921692
</actionGroup>
@@ -1803,7 +1803,7 @@
18031803
<actionGroup ref="addImageToStage" stepKey="addImageToStage">
18041804
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
18051805
</actionGroup>
1806-
<waitForElementVisible selector="{{ImageOnStage.imageSourceByIndex('1', PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="seeImage1SourceOnStage"/>
1806+
<waitForElementVisible selector="{{ImageOnStageWithoutImageUploaded.imageSourceByIndex('1', PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="seeImage1SourceOnStage"/>
18071807
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoStage">
18081808
<argument name="contentType" value="PageBuilderTextContentType"/>
18091809
</actionGroup>

0 commit comments

Comments
 (0)