Skip to content

Commit 092b5e4

Browse files
anthoulaanthoula
committed
Merge branch 'MC-3870' of github.com:magento-obsessive-owls/magento2-page-builder into cms-team-1-delivery
# Conflicts: # app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection.xml
2 parents c596ee3 + 8a6315f commit 092b5e4

File tree

29 files changed

+454
-104
lines changed

29 files changed

+454
-104
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.imageSource(property.fileName)}}" stepKey="waitForImageSource"/>
17+
<waitForElementVisible selector="{{ImageOnStageWithoutImageUploaded.imagePreview}}" stepKey="waitForImagePreview"/>
18+
<waitForElementVisible selector="{{ImageOnStageWithoutImageUploaded.imageSource(property.fileName)}}" stepKey="waitForImageSource"/>
1919
</actionGroup>
2020
<actionGroup name="verifyImageOnSlideout">
2121
<arguments>

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
<!-- Advanced Configuration -->
5050
<element name="alignment" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
5151
<element name="noAlignment" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper'][not(contains(@style,'text-align:'))]" parameterized="true"/>
52-
<element name="border" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
53-
<element name="borderColor" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
54-
<element name="noBorderColor" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][not(contains(@style,'border-color:'))]" parameterized="true"/>
55-
<element name="borderWidth" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
56-
<element name="borderRadius" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
52+
<element name="border" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
53+
<element name="borderColor" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
54+
<element name="noBorderColor" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper'][not(contains(@style,'border-color:'))]" parameterized="true"/>
55+
<element name="borderWidth" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
56+
<element name="borderRadius" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
5757
<element name="cssClasses" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
5858
<element name="noCssClasses" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][not(@class)]" parameterized="true"/>
5959
<element name="margins" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
@@ -103,11 +103,11 @@
103103
<!-- Advanced Configuration -->
104104
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
105105
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='wrapper'][not(contains(@style,'text-align:'))]" parameterized="true"/>
106-
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
107-
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
108-
<element name="noBorderColor" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][not(contains(@style,'border-color:'))]" parameterized="true"/>
109-
<element name="borderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
110-
<element name="borderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
106+
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='wrapper'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
107+
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='wrapper'])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
108+
<element name="noBorderColor" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='wrapper'])[{{arg1}}][not(contains(@style,'border-color:'))]" parameterized="true"/>
109+
<element name="borderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='wrapper'])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
110+
<element name="borderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='wrapper'])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
111111
<element name="cssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
112112
<element name="noCssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]" parameterized="true"/>
113113
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>

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

Lines changed: 18 additions & 6 deletions
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"/>
@@ -35,6 +35,18 @@
3535
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]//figure[contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
3636
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]//figure[contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
3737
</section>
38+
<section name="ImageOnStage">
39+
<element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]" parameterized="true"/>
40+
<!-- Advanced Configuration -->
41+
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]//figure[contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
42+
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]//figure//*[@data-element='desktop_image' and contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
43+
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]//figure//*[@data-element='desktop_image' and contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
44+
<element name="borderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]//figure//*[@data-element='desktop_image' and contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
45+
<element name="borderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]//figure//*[@data-element='desktop_image' and contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
46+
<element name="cssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]//figure[contains(@class,'{{arg2}}')]" parameterized="true"/>
47+
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]//figure[contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
48+
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]//figure[contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
49+
</section>
3850
<section name="ImageOnStorefront">
3951
<element name="base" type="text" selector="(//figure[@data-role='image'])[{{arg1}}]" parameterized="true"/>
4052
<element name="hidden" type="text" selector="(//figure[@data-role='image'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>
@@ -54,11 +66,11 @@
5466
<!-- Advanced Configuration -->
5567
<element name="alignment" type="text" selector="(//figure[@data-role='image'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
5668
<element name="noAlignment" type="text" selector="(//figure[@data-role='image'])[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>
57-
<element name="border" type="text" selector="(//figure[@data-role='image'])[{{arg1}}]//img[contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
58-
<element name="borderColor" type="text" selector="(//figure[@data-role='image'])[{{arg1}}]//img[contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
59-
<element name="noBorderColor" type="text" selector="(//figure[@data-role='image'])[{{arg1}}]//img[not(contains(@style,'border-color:'))]" parameterized="true"/>
60-
<element name="borderWidth" type="text" selector="(//figure[@data-role='image'])[{{arg1}}]//img[contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
61-
<element name="borderRadius" type="text" selector="(//figure[@data-role='image'])[{{arg1}}]//img[contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
69+
<element name="border" type="text" selector="(//figure[@data-role='image'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]|(//figure[@data-role='image'])[{{arg1}}]//*[@data-element='desktop_image' and contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
70+
<element name="borderColor" type="text" selector="(//figure[@data-role='image'])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]|(//figure[@data-role='image'])[{{arg1}}]//*[@data-element='desktop_image' and contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
71+
<element name="noBorderColor" type="text" selector="(//figure[@data-role='image'])[{{arg1}}][not(contains(@style,'border-color:'))]|(//figure[@data-role='image'])[{{arg1}}]//*[@data-element='desktop_image' and not(contains(@style,'border-color:'))]" parameterized="true"/>
72+
<element name="borderWidth" type="text" selector="(//figure[@data-role='image'])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]|(//figure[@data-role='image'])[{{arg1}}]//*[@data-element='desktop_image' and contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
73+
<element name="borderRadius" type="text" selector="(//figure[@data-role='image'])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]|(//figure[@data-role='image'])[{{arg1}}]//*[@data-element='desktop_image' and contains(@style,'border-radius: {{arg2}};')]" parameterized="true"/>
6274
<element name="cssClasses" type="text" selector="(//figure[@data-role='image'])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
6375
<element name="noCssClasses" type="text" selector="(//figure[@data-role='image'])[{{arg1}}][not(@class)]" parameterized="true"/>
6476
<element name="margins" type="text" selector="(//figure[@data-role='image'])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,4 +1314,37 @@
13141314
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
13151315
<see selector="{{BannerOnFrontend.button('1')}}" userInput="{{PageBuilderBannerButtonTextProperty_Non_Breaking_Space.value}}" stepKey="seeStorefrontNBSPButtonAfterSave"/>
13161316
</test>
1317+
<test name="BannerOverlayDoesNotHaveBorderRadiusAppliedOnCollageCenteredAppearance" extends="BannerOverlayHasConvertedBorderRadiusAppliedOnPosterAppearance">
1318+
<annotations>
1319+
<features value="PageBuilder"/>
1320+
<stories value="Banner"/>
1321+
<title value="Collage Center - Overlay does not have border radius applied on collage centered appearance"/>
1322+
<description value="As a content creator I do not want border radius of banner overlay with collage centered appearance to have a border radius applied to it so that I may be able to style it independently"/>
1323+
<severity value="MAJOR"/>
1324+
<useCaseId value="MC-3870"/>
1325+
<testCaseId value="MC-5253"/>
1326+
<group value="pagebuilder"/>
1327+
<group value="pagebuilder-banner"/>
1328+
<group value="pagebuilder-bannerCollageCenter"/>
1329+
</annotations>
1330+
<actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
1331+
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>
1332+
</actionGroup>
1333+
<assertEquals stepKey="assertOverlayBorderRadiusEqualityWhereBorderRadiusGreaterThanBorderWidth">
1334+
<expectedResult type="int">0</expectedResult>
1335+
<actualResult type="variable">$overlayBorderRadius</actualResult>
1336+
</assertEquals>
1337+
<assertEquals stepKey="assertOverlayBorderRadiusEqualityWhereBorderRadiusGreaterThanBorderWidthOnStorefront">
1338+
<expectedResult type="int">0</expectedResult>
1339+
<actualResult type="variable">$overlayBorderRadiusStorefront</actualResult>
1340+
</assertEquals>
1341+
<assertEquals stepKey="assertOverlayBorderRadiusEqualityWhereBorderRadiusLessThanOrEqualToBorderWidth">
1342+
<expectedResult type="int">0</expectedResult>
1343+
<actualResult type="variable">$overlayBorderRadius2</actualResult>
1344+
</assertEquals>
1345+
<assertEquals stepKey="assertOverlayBorderRadiusEqualityWhereBorderRadiusLessThanOrEqualToBorderWidthOnStorefront">
1346+
<expectedResult type="int">0</expectedResult>
1347+
<actualResult type="variable">$overlayBorderRadiusStorefront2</actualResult>
1348+
</assertEquals>
1349+
</test>
13171350
</tests>

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,4 +1276,37 @@
12761276
<argument name="property" value="PageBuilderBannerCollageLeftProperty"/>
12771277
</actionGroup>
12781278
</test>
1279+
<test name="BannerOverlayDoesNotHaveBorderRadiusAppliedOnCollageLeftAppearance" extends="BannerOverlayHasConvertedBorderRadiusAppliedOnPosterAppearance">
1280+
<annotations>
1281+
<features value="PageBuilder"/>
1282+
<stories value="Banner"/>
1283+
<title value="Collage Left - Overlay does not have border radius applied on collage left appearance"/>
1284+
<description value="As a content creator I do not want border radius of banner overlay with collage left appearance to have a border radius applied to it so that I may be able to style it independently"/>
1285+
<severity value="MAJOR"/>
1286+
<useCaseId value="MC-3870"/>
1287+
<testCaseId value="MC-5254"/>
1288+
<group value="pagebuilder"/>
1289+
<group value="pagebuilder-banner"/>
1290+
<group value="pagebuilder-bannerCollageLeft"/>
1291+
</annotations>
1292+
<actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
1293+
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
1294+
</actionGroup>
1295+
<assertEquals stepKey="assertOverlayBorderRadiusEqualityWhereBorderRadiusGreaterThanBorderWidth">
1296+
<expectedResult type="int">0</expectedResult>
1297+
<actualResult type="variable">$overlayBorderRadius</actualResult>
1298+
</assertEquals>
1299+
<assertEquals stepKey="assertOverlayBorderRadiusEqualityWhereBorderRadiusGreaterThanBorderWidthOnStorefront">
1300+
<expectedResult type="int">0</expectedResult>
1301+
<actualResult type="variable">$overlayBorderRadiusStorefront</actualResult>
1302+
</assertEquals>
1303+
<assertEquals stepKey="assertOverlayBorderRadiusEqualityWhereBorderRadiusLessThanOrEqualToBorderWidth">
1304+
<expectedResult type="int">0</expectedResult>
1305+
<actualResult type="variable">$overlayBorderRadius2</actualResult>
1306+
</assertEquals>
1307+
<assertEquals stepKey="assertOverlayBorderRadiusEqualityWhereBorderRadiusLessThanOrEqualToBorderWidthOnStorefront">
1308+
<expectedResult type="int">0</expectedResult>
1309+
<actualResult type="variable">$overlayBorderRadiusStorefront2</actualResult>
1310+
</assertEquals>
1311+
</test>
12791312
</tests>

0 commit comments

Comments
 (0)