Skip to content

Commit 31e8add

Browse files
anthoulaanthoula
committed
MC-5432: Contained Row Appearance Renders Too Small When In Smaller Container or in Block/Dynamic Block
- add row full bleed test - add row full width test
1 parent 952f17b commit 31e8add

File tree

3 files changed

+77
-10
lines changed

3 files changed

+77
-10
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
<element name="baseJS" type="button" selector="document.querySelectorAll('[data-role=banner] div.pagebuilder-banner-wrapper')[{{arg1}} - 1]" parameterized="true"/>
1414
<element name="hidden" type="button" selector="(//div[@data-role='banner'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>
1515
<element name="notHidden" type="button" selector="(//div[@data-role='banner'])[{{arg1}}][not(contains(@style, 'display: none'))]" parameterized="true"/>
16-
<element name="appearancePosterCSS" type="button" selector="[data-role=banner][data-appearance=poster]"/>
1716
<element name="wrapperJS" type="button" selector="document.querySelectorAll('[data-role=banner] div.pagebuilder-banner-wrapper')[{{arg1}} - 1]" parameterized="true"/>
1817
<element name="overlay" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='overlay']" parameterized="true"/>
1918
<element name="overlayJS" type="button" selector="document.querySelectorAll('[data-role=banner] div.pagebuilder-overlay')[{{arg1}} - 1]" parameterized="true"/>
2019
<element name="wysiwygLinkUrl" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//a[@href='{{arg2}}']" parameterized="true"/>
2120
<!-- Appearance Configuration -->
2221
<element name="appearance" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
22+
<element name="appearancePosterCSS" type="button" selector="[data-role=banner][data-appearance=poster]"/>
2323
<element name="posterMinimumHeight" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='overlay'][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>
2424
<element name="collageMinimumHeight" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>
2525
<!-- Background Configuration -->

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@
8484
<element name="rowH2ChildWidthJS" type="text" selector="document.querySelectorAll('div[data-appearance~=\'{{arg1}}\'] h2')[{{arg2}}].clientWidth" parameterized="true"/>
8585
<element name="appearance" type="text" selector="(//div[@data-role='row'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
8686
<element name="appearanceContainedCSS" type="text" selector="[data-role=row][data-appearance=contained]"/>
87+
<element name="appearanceFullBleedCSS" type="text" selector="[data-role=row][data-appearance=full-bleed]"/>
88+
<element name="appearanceFullWidthCSS" type="text" selector="[data-role=row][data-appearance=full-width]"/>
8789
<!-- Background Configuration -->
8890
<element name="backgroundColor" type="button" selector="(//div[@data-role='row'])[{{arg1}}]/div[contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
8991
<element name="noBackgroundColor" type="button" selector="(//div[@data-role='row'])[{{arg1}}]/div[not(contains(@style,'background-color:'))]" parameterized="true"/>

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

Lines changed: 74 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1323,6 +1323,7 @@
13231323
<group value="pagebuilder"/>
13241324
<group value="pagebuilder-block"/>
13251325
<group value="pagebuilder-row"/>
1326+
<group value="pagebuilder-rowAppearances"/>
13261327
<group value="pagebuilder-banner"/>
13271328
<group value="pagebuilder-bannerPoster"/>
13281329
</annotations>
@@ -1342,7 +1343,7 @@
13421343
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
13431344
<argument name="contentType" value="PageBuilderRowContentType"/>
13441345
</actionGroup>
1345-
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceRow1">
1346+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterRowAppearance">
13461347
<argument name="property" value="PageBuilderRowAppearance_Contained"/>
13471348
</actionGroup>
13481349
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsInBlock"/>
@@ -1364,11 +1365,8 @@
13641365
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBannerMinHeight">
13651366
<argument name="property" value="PageBuilderBannerMinimumHeightProperty"/>
13661367
</actionGroup>
1367-
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachImage">
1368-
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
1369-
</actionGroup>
1370-
<actionGroup ref="chooseVisualSelectOption" stepKey="selectBackgroundSize">
1371-
<argument name="property" value="PageBuilderBackgroundSize_Contain"/>
1368+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColor">
1369+
<argument name="property" value="PageBuilderBackgroundColor_Plaintext_Green"/>
13721370
</actionGroup>
13731371
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsInBlock2"/>
13741372
<click selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="saveBlock"/>
@@ -1397,7 +1395,6 @@
13971395
<comment userInput="Validate width before save" stepKey="commentValidateBeforeSave"/>
13981396
<actionGroup ref="validateContentWidthEqualToContainerWidth" stepKey="validateContentWidthEqualToContainerWidthBeforeSave">
13991397
<argument name="content" value="{{BannerOnFrontend.appearancePosterCSS}}"/>
1400-
<argument name="contentIndex" value="1"/>
14011398
<argument name="container" value="{{RowOnStorefront.appearanceContainedCSS}}"/>
14021399
<argument name="containerIndex" value="2"/>
14031400
<argument name="containerPadding" value="PageBuilderPaddingPropertyRowDefault"/>
@@ -1408,7 +1405,6 @@
14081405
<comment userInput="Validate width after save" stepKey="commentValidateAfterSave"/>
14091406
<actionGroup ref="validateContentWidthEqualToContainerWidth" stepKey="validateContentWidthEqualToContainerWidthAfterSave">
14101407
<argument name="content" value="{{BannerOnFrontend.appearancePosterCSS}}"/>
1411-
<argument name="contentIndex" value="1"/>
14121408
<argument name="container" value="{{RowOnStorefront.appearanceContainedCSS}}"/>
14131409
<argument name="containerIndex" value="2"/>
14141410
<argument name="containerPadding" value="PageBuilderPaddingPropertyRowDefault"/>
@@ -1420,12 +1416,81 @@
14201416
<comment userInput="Validate width storefront" stepKey="commentValidateStorefront"/>
14211417
<actionGroup ref="validateContentWidthEqualToContainerWidth" stepKey="validateContentWidthEqualToContainerWidthStorefront">
14221418
<argument name="content" value="{{BannerOnFrontend.appearancePosterCSS}}"/>
1423-
<argument name="contentIndex" value="1"/>
14241419
<argument name="container" value="{{RowOnStorefront.appearanceContainedCSS}}"/>
14251420
<argument name="containerIndex" value="2"/>
14261421
<argument name="containerPadding" value="PageBuilderPaddingPropertyRowDefault"/>
14271422
</actionGroup>
14281423
</test>
1424+
<test name="BlockRowFullWidthAppearanceHasEqualWidthToContents" extends="BlockRowContainedAppearanceHasEqualWidthToContents">
1425+
<annotations>
1426+
<features value="PageBuilder"/>
1427+
<stories value="Block"/>
1428+
<title value="Row full width appearance has equal width to contents in Block"/>
1429+
<description value="A user can see a row full width appearance has equal width to contents in a Block"/>
1430+
<severity value="MAJOR"/>
1431+
<useCaseId value="MC-5432"/>
1432+
<testCaseId value="MC-6012"/>
1433+
<group value="pagebuilder"/>
1434+
<group value="pagebuilder-block"/>
1435+
<group value="pagebuilder-row"/>
1436+
<group value="pagebuilder-rowAppearances"/>
1437+
<group value="pagebuilder-banner"/>
1438+
<group value="pagebuilder-bannerPoster"/>
1439+
</annotations>
1440+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterRowAppearance">
1441+
<argument name="property" value="PageBuilderRowAppearance_FullWidth"/>
1442+
</actionGroup>
1443+
<actionGroup ref="validateContentWidthEqualToContainerWidth" stepKey="validateContentWidthEqualToContainerWidthBeforeSave">
1444+
<argument name="content" value="{{BannerOnFrontend.appearancePosterCSS}}"/>
1445+
<argument name="container" value="{{RowOnStorefront.appearanceFullWidthCSS}}"/>
1446+
<argument name="containerPadding" value="PageBuilderPaddingPropertyRowDefault"/>
1447+
</actionGroup>
1448+
<actionGroup ref="validateContentWidthEqualToContainerWidth" stepKey="validateContentWidthEqualToContainerWidthAfterSave">
1449+
<argument name="content" value="{{BannerOnFrontend.appearancePosterCSS}}"/>
1450+
<argument name="container" value="{{RowOnStorefront.appearanceFullWidthCSS}}"/>
1451+
<argument name="containerPadding" value="PageBuilderPaddingPropertyRowDefault"/>
1452+
</actionGroup>
1453+
<actionGroup ref="validateContentWidthEqualToContainerWidth" stepKey="validateContentWidthEqualToContainerWidthStorefront">
1454+
<argument name="content" value="{{BannerOnFrontend.appearancePosterCSS}}"/>
1455+
<argument name="container" value="{{RowOnStorefront.appearanceFullWidthCSS}}"/>
1456+
<argument name="containerPadding" value="PageBuilderPaddingPropertyRowDefault"/>
1457+
</actionGroup>
1458+
</test>
1459+
<test name="BlockRowFullBleedAppearanceHasEqualWidthToContents" extends="BlockRowContainedAppearanceHasEqualWidthToContents">
1460+
<annotations>
1461+
<features value="PageBuilder"/>
1462+
<stories value="Block"/>
1463+
<title value="Row full bleed appearance has equal width to contents in Block"/>
1464+
<description value="A user can see a row full bleed appearance has equal width to contents in a Block"/>
1465+
<severity value="MAJOR"/>
1466+
<useCaseId value="MC-5432"/>
1467+
<testCaseId value="MC-6011"/>
1468+
<group value="pagebuilder"/>
1469+
<group value="pagebuilder-block"/>
1470+
<group value="pagebuilder-row"/>
1471+
<group value="pagebuilder-rowAppearances"/>
1472+
<group value="pagebuilder-banner"/>
1473+
<group value="pagebuilder-bannerPoster"/>
1474+
</annotations>
1475+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterRowAppearance">
1476+
<argument name="property" value="PageBuilderRowAppearance_FullBleed"/>
1477+
</actionGroup>
1478+
<actionGroup ref="validateContentWidthEqualToContainerWidth" stepKey="validateContentWidthEqualToContainerWidthBeforeSave">
1479+
<argument name="content" value="{{BannerOnFrontend.appearancePosterCSS}}"/>
1480+
<argument name="container" value="{{RowOnStorefront.appearanceFullBleedCSS}}"/>
1481+
<argument name="containerPadding" value="PageBuilderPaddingPropertyRowDefault"/>
1482+
</actionGroup>
1483+
<actionGroup ref="validateContentWidthEqualToContainerWidth" stepKey="validateContentWidthEqualToContainerWidthAfterSave">
1484+
<argument name="content" value="{{BannerOnFrontend.appearancePosterCSS}}"/>
1485+
<argument name="container" value="{{RowOnStorefront.appearanceFullBleedCSS}}"/>
1486+
<argument name="containerPadding" value="PageBuilderPaddingPropertyRowDefault"/>
1487+
</actionGroup>
1488+
<actionGroup ref="validateContentWidthEqualToContainerWidth" stepKey="validateContentWidthEqualToContainerWidthStorefront">
1489+
<argument name="content" value="{{BannerOnFrontend.appearancePosterCSS}}"/>
1490+
<argument name="container" value="{{RowOnStorefront.appearanceFullBleedCSS}}"/>
1491+
<argument name="containerPadding" value="PageBuilderPaddingPropertyRowDefault"/>
1492+
</actionGroup>
1493+
</test>
14291494
<test name="BlockBannerPosterContentCanWordWrap">
14301495
<annotations>
14311496
<features value="PageBuilder"/>

0 commit comments

Comments
 (0)