Skip to content

Commit 67378c2

Browse files
author
Hwashiang Yu
committed
MC-4290: Alignment Doesn't Work For Slide, Banners, & Text Placeholders & for Slide Content & Banner Poster Content
- Added test coverage for alignment inheritence for banner, slider, and text
1 parent f63c1c1 commit 67378c2

9 files changed

+366
-0
lines changed

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,4 +1347,23 @@
13471347
<actualResult type="variable">$overlayBorderRadiusStorefront2</actualResult>
13481348
</assertEquals>
13491349
</test>
1350+
<test name="BannerCollageCenterAlignmentInheritance" extends="BannerPosterAlignmentInheritance">
1351+
<annotations>
1352+
<features value="PageBuilder"/>
1353+
<stories value="Banner"/>
1354+
<title value="Collage Center - Alignment Inherits"/>
1355+
<description value="A user should be able to have a parent container content type pass its alignment to its children"/>
1356+
<severity value="CRITICAL"/>
1357+
<useCaseId value="MC-4290"/>
1358+
<testCaseId value="MC-6018"/>
1359+
<group value="pagebuilder"/>
1360+
<group value="pagebuilder-banner"/>
1361+
<group value="pagebuilder-bannerCollageCenter"/>
1362+
</annotations>
1363+
<!-- Fill Out Banner Edit Panel -->
1364+
<comment userInput="Fill Out Banner Edit Panel" stepKey="commentFillBannerEditPanel"/>
1365+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1366+
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>
1367+
</actionGroup>
1368+
</test>
13501369
</tests>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,4 +1328,23 @@
13281328
<actualResult type="variable">$overlayBorderRadiusStorefront2</actualResult>
13291329
</assertEquals>
13301330
</test>
1331+
<test name="BannerCollageLeftAlignmentInheritance" extends="BannerPosterAlignmentInheritance">
1332+
<annotations>
1333+
<features value="PageBuilder"/>
1334+
<stories value="Banner"/>
1335+
<title value="Collage Left - Alignment Inherits"/>
1336+
<description value="A user should be able to have a parent container content type pass its alignment to its children"/>
1337+
<severity value="CRITICAL"/>
1338+
<useCaseId value="MC-4290"/>
1339+
<testCaseId value="MC-6017"/>
1340+
<group value="pagebuilder"/>
1341+
<group value="pagebuilder-banner"/>
1342+
<group value="pagebuilder-bannerCollageLeft"/>
1343+
</annotations>
1344+
<!-- Fill Out Banner Edit Panel -->
1345+
<comment userInput="Fill Out Banner Edit Panel" stepKey="commentFillBannerEditPanel"/>
1346+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1347+
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
1348+
</actionGroup>
1349+
</test>
13311350
</tests>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,4 +1251,23 @@
12511251
<actualResult type="variable">$overlayBorderRadiusStorefront2</actualResult>
12521252
</assertEquals>
12531253
</test>
1254+
<test name="BannerCollageRightAlignmentInheritance" extends="BannerPosterAlignmentInheritance">
1255+
<annotations>
1256+
<features value="PageBuilder"/>
1257+
<stories value="Banner"/>
1258+
<title value="Collage Right - Alignment Inherits"/>
1259+
<description value="A user should be able to have a parent container content type pass its alignment to its children"/>
1260+
<severity value="CRITICAL"/>
1261+
<useCaseId value="MC-4290"/>
1262+
<testCaseId value="MC-6016"/>
1263+
<group value="pagebuilder"/>
1264+
<group value="pagebuilder-banner"/>
1265+
<group value="pagebuilder-bannerCollageRight"/>
1266+
</annotations>
1267+
<!-- Fill Out Banner Edit Panel -->
1268+
<comment userInput="Fill Out Banner Edit Panel" stepKey="commentFillBannerEditPanel"/>
1269+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1270+
<argument name="property" value="PageBuilderAppearance_CollageRight"/>
1271+
</actionGroup>
1272+
</test>
12541273
</tests>

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

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1757,4 +1757,91 @@
17571757
<actualResult type="variable">$overlayBorderRadiusStorefront2</actualResult>
17581758
</assertEquals>
17591759
</test>
1760+
<test name="BannerPosterAlignmentInheritance">
1761+
<annotations>
1762+
<features value="PageBuilder"/>
1763+
<stories value="Banner"/>
1764+
<title value="Poster - Alignment Inherits"/>
1765+
<description value="A user should be able to have a parent container content type pass its alignment to its children"/>
1766+
<severity value="CRITICAL"/>
1767+
<useCaseId value="MC-4290"/>
1768+
<testCaseId value="MC-6015"/>
1769+
<group value="pagebuilder"/>
1770+
<group value="pagebuilder-banner"/>
1771+
<group value="pagebuilder-bannerPoster"/>
1772+
</annotations>
1773+
<before>
1774+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1775+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1776+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1777+
</before>
1778+
<after>
1779+
<actionGroup ref="logout" stepKey="logout"/>
1780+
</after>
1781+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1782+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1783+
</actionGroup>
1784+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1785+
<argument name="group" value="PageBuilderBannerContentType"/>
1786+
</actionGroup>
1787+
<!-- Add Banner To Row -->
1788+
<comment userInput="Add Banner To Row" stepKey="commentAddBannerToRow"/>
1789+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBannerIntoStage">
1790+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1791+
</actionGroup>
1792+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openBannerEditMenuOnStage">
1793+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1794+
</actionGroup>
1795+
<!-- Fill Out Banner Edit Panel -->
1796+
<comment userInput="Fill Out Banner Edit Panel" stepKey="commentFillBannerEditPanel"/>
1797+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1798+
<argument name="property" value="PageBuilderBannerAppearance_Poster"/>
1799+
</actionGroup>
1800+
<actionGroup ref="addTextToTinyMCE" stepKey="enterMessageText">
1801+
<argument name="property" value="PageBuilderBannerMessageProperty"/>
1802+
<argument name="section" value="BannerOnConfigurationPanel"/>
1803+
</actionGroup>
1804+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignmentDefault">
1805+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyDefault"/>
1806+
</actionGroup>
1807+
<actionGroup ref="saveEditPanelSettings" stepKey="saveBannerEditPanelSettings"/>
1808+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusBannerEditor"/>
1809+
<!-- Fill Out Row Edit Panel -->
1810+
<comment userInput="Fill Out Row Edit Panel" stepKey="commentFillRowEditPanel"/>
1811+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openRowEditMenuOnStage">
1812+
<argument name="contentType" value="PageBuilderRowContentType"/>
1813+
</actionGroup>
1814+
<comment userInput="Update Values" stepKey="commentUpdateValues"/>
1815+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignment">
1816+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyRight"/>
1817+
</actionGroup>
1818+
<actionGroup ref="saveEditPanelSettings" stepKey="saveRowEditPanelSettings"/>
1819+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusRowEditor"/>
1820+
<!-- Validate Stage -->
1821+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
1822+
<executeJS function="return window.getComputedStyle({{BannerOnBackend.wrapperJS('1')}}).textAlign" stepKey="grabComputedTextAlign"/>
1823+
<assertEquals stepKey="assertComputedTextAlign">
1824+
<expectedResult type="string">{{PageBuilderAdvancedAlignmentPropertyRight.value}}</expectedResult>
1825+
<actualResult type="variable">grabComputedTextAlign</actualResult>
1826+
</assertEquals>
1827+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1828+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1829+
<!-- Validate Stage After Save -->
1830+
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
1831+
<executeJS function="return window.getComputedStyle({{BannerOnBackend.wrapperJS('1')}}).textAlign" stepKey="grabComputedTextAlignAfterSave"/>
1832+
<assertEquals stepKey="assertComputedTextAlignAfterSave">
1833+
<expectedResult type="string">{{PageBuilderAdvancedAlignmentPropertyRight.value}}</expectedResult>
1834+
<actualResult type="variable">grabComputedTextAlignAfterSave</actualResult>
1835+
</assertEquals>
1836+
<!-- Validate Storefront -->
1837+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1838+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1839+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1840+
</actionGroup>
1841+
<executeJS function="return window.getComputedStyle({{BannerOnFrontend.wrapperJS('1')}}).textAlign" stepKey="grabComputedTextAlignStoreFront"/>
1842+
<assertEquals stepKey="assertComputedTextAlignStoreFront">
1843+
<expectedResult type="string">{{PageBuilderAdvancedAlignmentPropertyRight.value}}</expectedResult>
1844+
<actualResult type="variable">grabComputedTextAlignStoreFront</actualResult>
1845+
</assertEquals>
1846+
</test>
17601847
</tests>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,4 +653,21 @@
653653
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
654654
<see selector="{{SlideOnFrontend.button('1')}}" userInput="{{PageBuilderBannerButtonTextProperty_Non_Breaking_Space.value}}" stepKey="seeStorefrontNBSPButtonAfterSave"/>
655655
</test>
656+
<test name="SliderCollageCenterAlignmentInheritance" extends="SliderPosterAlignmentInheritance">
657+
<annotations>
658+
<features value="PageBuilder"/>
659+
<stories value="Slider"/>
660+
<title value="Collage Center - Alignment Inherits"/>
661+
<description value="A user should be able to have a parent container content type pass its alignment to its children"/>
662+
<severity value="CRITICAL"/>
663+
<useCaseId value="MC-4290"/>
664+
<testCaseId value="MC-6025"/>
665+
<group value="pagebuilder"/>
666+
<group value="pagebuilder-slider"/>
667+
<group value="pagebuilder-sliderCollageCenter"/>
668+
</annotations>
669+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
670+
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>
671+
</actionGroup>
672+
</test>
656673
</tests>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,4 +536,21 @@
536536
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
537537
</actionGroup>
538538
</test>
539+
<test name="SliderCollageLeftAlignmentInheritance" extends="SliderPosterAlignmentInheritance">
540+
<annotations>
541+
<features value="PageBuilder"/>
542+
<stories value="Slider"/>
543+
<title value="Collage Left - Alignment Inherits"/>
544+
<description value="A user should be able to have a parent container content type pass its alignment to its children"/>
545+
<severity value="CRITICAL"/>
546+
<useCaseId value="MC-4290"/>
547+
<testCaseId value="MC-6024"/>
548+
<group value="pagebuilder"/>
549+
<group value="pagebuilder-slider"/>
550+
<group value="pagebuilder-sliderCollageLeft"/>
551+
</annotations>
552+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
553+
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
554+
</actionGroup>
555+
</test>
539556
</tests>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,4 +427,21 @@
427427
<argument name="property" value="PageBuilderAppearance_CollageRight"/>
428428
</actionGroup>
429429
</test>
430+
<test name="SliderCollageRightAlignmentInheritance" extends="SliderPosterAlignmentInheritance">
431+
<annotations>
432+
<features value="PageBuilder"/>
433+
<stories value="Slider"/>
434+
<title value="Collage Right - Alignment Inherits"/>
435+
<description value="A user should be able to have a parent container content type pass its alignment to its children"/>
436+
<severity value="CRITICAL"/>
437+
<useCaseId value="MC-4290"/>
438+
<testCaseId value="MC-6023"/>
439+
<group value="pagebuilder"/>
440+
<group value="pagebuilder-slider"/>
441+
<group value="pagebuilder-sliderCollageRight"/>
442+
</annotations>
443+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
444+
<argument name="property" value="PageBuilderAppearance_CollageRight"/>
445+
</actionGroup>
446+
</test>
430447
</tests>

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

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1479,4 +1479,91 @@
14791479
<seeElement selector="{{SlideOnBackend.posterPadding('1', PageBuilderPaddingProperty40.value)}}" stepKey="seePosterPadding2" />
14801480
<dontSeeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderPaddingProperty40.value)}}" stepKey="dontSeeCollagePadding2" />
14811481
</test>
1482+
<test name="SliderPosterAlignmentInheritance">
1483+
<annotations>
1484+
<features value="PageBuilder"/>
1485+
<stories value="Slider"/>
1486+
<title value="Poster - Alignment Inherits"/>
1487+
<description value="A user should be able to have a parent container content type pass its alignment to its children"/>
1488+
<severity value="CRITICAL"/>
1489+
<useCaseId value="MC-4290"/>
1490+
<testCaseId value="MC-6014"/>
1491+
<group value="pagebuilder"/>
1492+
<group value="pagebuilder-slider"/>
1493+
<group value="pagebuilder-sliderPoster"/>
1494+
</annotations>
1495+
<before>
1496+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1497+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1498+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1499+
</before>
1500+
<after>
1501+
<actionGroup ref="logout" stepKey="logout"/>
1502+
</after>
1503+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1504+
<argument name="contentType" value="PageBuilderSliderContentType"/>
1505+
</actionGroup>
1506+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1507+
<argument name="group" value="PageBuilderSliderContentType"/>
1508+
</actionGroup>
1509+
<!-- Add Slider To Row -->
1510+
<comment userInput="Add Slider To Row" stepKey="commentAddSliderToRow"/>
1511+
<actionGroup ref="dragContentTypeToStage" stepKey="dragSliderIntoStage">
1512+
<argument name="contentType" value="PageBuilderSliderContentType"/>
1513+
</actionGroup>
1514+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openSliderEditPanelOnStage">
1515+
<argument name="section" value="SlideOnBackend"/>
1516+
</actionGroup>
1517+
<!-- Fill Out Slide Item Edit Panel -->
1518+
<comment userInput="Fill Out Slide Item Edit Panel" stepKey="commentFillSlideItemEditPanel"/>
1519+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1520+
<argument name="property" value="PageBuilderAppearance_Poster"/>
1521+
</actionGroup>
1522+
<actionGroup ref="addTextToTinyMCE" stepKey="enterMessageText">
1523+
<argument name="property" value="PageBuilderSlideItemContent_Slide1"/>
1524+
<argument name="section" value="SlideOnConfigurationPanel"/>
1525+
</actionGroup>
1526+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignmentDefault">
1527+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyDefault"/>
1528+
</actionGroup>
1529+
<actionGroup ref="saveEditPanelSettings" stepKey="saveSlideItemEditPanelSettings"/>
1530+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusSlideItemEditor"/>
1531+
<!-- Fill Out Row Edit Panel -->
1532+
<comment userInput="Fill Out Row Edit Panel" stepKey="commentFillRowEditPanel"/>
1533+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openRowEditMenuOnStage">
1534+
<argument name="contentType" value="PageBuilderRowContentType"/>
1535+
</actionGroup>
1536+
<comment userInput="Update Values" stepKey="commentUpdateValues"/>
1537+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignment">
1538+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyRight"/>
1539+
</actionGroup>
1540+
<actionGroup ref="saveEditPanelSettings" stepKey="saveRowEditPanelSettings"/>
1541+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusRowEditor"/>
1542+
<!-- Validate Stage -->
1543+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
1544+
<executeJS function="return window.getComputedStyle({{SlideOnBackend.contentJS('1')}}).textAlign" stepKey="grabComputedTextAlign"/>
1545+
<assertEquals stepKey="assertComputedTextAlign">
1546+
<expectedResult type="string">{{PageBuilderAdvancedAlignmentPropertyRight.value}}</expectedResult>
1547+
<actualResult type="variable">grabComputedTextAlign</actualResult>
1548+
</assertEquals>
1549+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1550+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1551+
<!-- Validate Stage After Save -->
1552+
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
1553+
<executeJS function="return window.getComputedStyle({{SlideOnBackend.contentJS('1')}}).textAlign" stepKey="grabComputedTextAlignAfterSave"/>
1554+
<assertEquals stepKey="assertComputedTextAlignAfterSave">
1555+
<expectedResult type="string">{{PageBuilderAdvancedAlignmentPropertyRight.value}}</expectedResult>
1556+
<actualResult type="variable">grabComputedTextAlignAfterSave</actualResult>
1557+
</assertEquals>
1558+
<!-- Validate Storefront -->
1559+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1560+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1561+
<argument name="contentType" value="PageBuilderSliderContentType"/>
1562+
</actionGroup>
1563+
<executeJS function="return window.getComputedStyle({{SlideOnFrontend.contentJS('1')}}).textAlign" stepKey="grabComputedTextAlignStoreFront"/>
1564+
<assertEquals stepKey="assertComputedTextAlignStoreFront">
1565+
<expectedResult type="string">{{PageBuilderAdvancedAlignmentPropertyRight.value}}</expectedResult>
1566+
<actualResult type="variable">grabComputedTextAlignStoreFront</actualResult>
1567+
</assertEquals>
1568+
</test>
14821569
</tests>

0 commit comments

Comments
 (0)