Skip to content

Commit d8e3683

Browse files
danmooney2danmooney2
committed
Merge remote-tracking branch 'remotes/origin/MC-4290-alignment-slider-banner-text' into cms-team-1-delivery
2 parents 084c0ad + fb65296 commit d8e3683

25 files changed

+511
-18
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Data/AdvancedData.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
<data key="value"/>
1717
<data key="optionsList">[Default, Left, Center, Right]</data>
1818
</entity>
19+
<entity name="PageBuilderAdvancedAlignmentPropertyStart" type="pagebuilder_advanced_alignment_property">
20+
<data key="value">start</data>
21+
</entity>
1922
<entity name="PageBuilderAdvancedAlignmentPropertyLeft" type="pagebuilder_advanced_alignment_property">
2023
<data key="name">Alignment</data>
2124
<data key="section">advanced</data>

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1370,4 +1370,27 @@
13701370
<argument name="diffThreshold" value="0"/>
13711371
</actionGroup>
13721372
</test>
1373+
<test name="BannerCollageCenterAlignmentInheritance" extends="BannerPosterAlignmentInheritance">
1374+
<annotations>
1375+
<features value="PageBuilder"/>
1376+
<stories value="Banner"/>
1377+
<title value="Collage Center - Alignment Inherits"/>
1378+
<description value="A user should be able to have a parent container content type pass its alignment to its children"/>
1379+
<severity value="MAJOR"/>
1380+
<useCaseId value="MC-4290"/>
1381+
<testCaseId value="MC-6018"/>
1382+
<group value="pagebuilder"/>
1383+
<group value="pagebuilder-banner"/>
1384+
<group value="pagebuilder-bannerCollageCenter"/>
1385+
</annotations>
1386+
<!-- Fill Out Banner Edit Panel -->
1387+
<comment userInput="Fill Out Banner Edit Panel" stepKey="commentFillBannerEditPanel"/>
1388+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1389+
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>
1390+
</actionGroup>
1391+
<executeJS function="return Math.abs(Math.round({$buttonLeftPosition}-{$overlayLeftPosition}-30))" stepKey="buttonMinusOverlayMinusPadding"/>
1392+
<executeJS function="return Math.abs(Math.round({$overlayRightPosition}-{$buttonRightPosition}-30))" stepKey="overlayMinusButtonMinusPadding"/>
1393+
<executeJS function="return Math.abs(Math.round({$overlayRightPositionAfterSave}-{$buttonRightPositionAfterSave}-30))" stepKey="overlayMinusButtonMinusPaddingAfterSave"/>
1394+
<executeJS function="return Math.abs(Math.round({$overlayRightPositionStoreFront}-{$buttonRightPositionStoreFront}-30))" stepKey="overlayMinusButtonMinusPaddingStoreFront"/>
1395+
</test>
13731396
</tests>

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1373,4 +1373,27 @@
13731373
<argument name="diffThreshold" value="0"/>
13741374
</actionGroup>
13751375
</test>
1376+
<test name="BannerCollageLeftAlignmentInheritance" extends="BannerPosterAlignmentInheritance">
1377+
<annotations>
1378+
<features value="PageBuilder"/>
1379+
<stories value="Banner"/>
1380+
<title value="Collage Left - Alignment Inherits"/>
1381+
<description value="A user should be able to have a parent container content type pass its alignment to its children"/>
1382+
<severity value="MAJOR"/>
1383+
<useCaseId value="MC-4290"/>
1384+
<testCaseId value="MC-6017"/>
1385+
<group value="pagebuilder"/>
1386+
<group value="pagebuilder-banner"/>
1387+
<group value="pagebuilder-bannerCollageLeft"/>
1388+
</annotations>
1389+
<!-- Fill Out Banner Edit Panel -->
1390+
<comment userInput="Fill Out Banner Edit Panel" stepKey="commentFillBannerEditPanel"/>
1391+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1392+
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
1393+
</actionGroup>
1394+
<executeJS function="return Math.abs(Math.round({$buttonLeftPosition}-{$overlayLeftPosition}-30))" stepKey="buttonMinusOverlayMinusPadding"/>
1395+
<executeJS function="return Math.abs(Math.round({$overlayRightPosition}-{$buttonRightPosition}-30))" stepKey="overlayMinusButtonMinusPadding"/>
1396+
<executeJS function="return Math.abs(Math.round({$overlayRightPositionAfterSave}-{$buttonRightPositionAfterSave}-30))" stepKey="overlayMinusButtonMinusPaddingAfterSave"/>
1397+
<executeJS function="return Math.abs(Math.round({$overlayRightPositionStoreFront}-{$buttonRightPositionStoreFront}-30))" stepKey="overlayMinusButtonMinusPaddingStoreFront"/>
1398+
</test>
13761399
</tests>

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,4 +1274,27 @@
12741274
<argument name="diffThreshold" value="0"/>
12751275
</actionGroup>
12761276
</test>
1277+
<test name="BannerCollageRightAlignmentInheritance" extends="BannerPosterAlignmentInheritance">
1278+
<annotations>
1279+
<features value="PageBuilder"/>
1280+
<stories value="Banner"/>
1281+
<title value="Collage Right - Alignment Inherits"/>
1282+
<description value="A user should be able to have a parent container content type pass its alignment to its children"/>
1283+
<severity value="MAJOR"/>
1284+
<useCaseId value="MC-4290"/>
1285+
<testCaseId value="MC-6016"/>
1286+
<group value="pagebuilder"/>
1287+
<group value="pagebuilder-banner"/>
1288+
<group value="pagebuilder-bannerCollageRight"/>
1289+
</annotations>
1290+
<!-- Fill Out Banner Edit Panel -->
1291+
<comment userInput="Fill Out Banner Edit Panel" stepKey="commentFillBannerEditPanel"/>
1292+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1293+
<argument name="property" value="PageBuilderAppearance_CollageRight"/>
1294+
</actionGroup>
1295+
<executeJS function="return Math.abs(Math.round({$buttonLeftPosition}-{$overlayLeftPosition}-30))" stepKey="buttonMinusOverlayMinusPadding"/>
1296+
<executeJS function="return Math.abs(Math.round({$overlayRightPosition}-{$buttonRightPosition}-30))" stepKey="overlayMinusButtonMinusPadding"/>
1297+
<executeJS function="return Math.abs(Math.round({$overlayRightPositionAfterSave}-{$buttonRightPositionAfterSave}-30))" stepKey="overlayMinusButtonMinusPaddingAfterSave"/>
1298+
<executeJS function="return Math.abs(Math.round({$overlayRightPositionStoreFront}-{$buttonRightPositionStoreFront}-30))" stepKey="overlayMinusButtonMinusPaddingStoreFront"/>
1299+
</test>
12771300
</tests>

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

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1881,4 +1881,133 @@
18811881
<argument name="diffThreshold" value="0"/>
18821882
</actionGroup>
18831883
</test>
1884+
<test name="BannerPosterAlignmentInheritance">
1885+
<annotations>
1886+
<features value="PageBuilder"/>
1887+
<stories value="Banner"/>
1888+
<title value="Poster - Alignment Inherits"/>
1889+
<description value="A user should be able to have a parent container content type pass its alignment to its children"/>
1890+
<severity value="MAJOR"/>
1891+
<useCaseId value="MC-4290"/>
1892+
<testCaseId value="MC-6015"/>
1893+
<group value="pagebuilder"/>
1894+
<group value="pagebuilder-banner"/>
1895+
<group value="pagebuilder-bannerPoster"/>
1896+
</annotations>
1897+
<before>
1898+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1899+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1900+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1901+
</before>
1902+
<after>
1903+
<actionGroup ref="logout" stepKey="logout"/>
1904+
</after>
1905+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1906+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1907+
</actionGroup>
1908+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1909+
<argument name="group" value="PageBuilderBannerContentType"/>
1910+
</actionGroup>
1911+
<!-- Add Banner To Row -->
1912+
<comment userInput="Add Banner To Row" stepKey="commentAddBannerToRow"/>
1913+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBannerIntoStage">
1914+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1915+
</actionGroup>
1916+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openBannerEditMenuOnStage">
1917+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1918+
</actionGroup>
1919+
<!-- Fill Out Banner Edit Panel -->
1920+
<comment userInput="Fill Out Banner Edit Panel" stepKey="commentFillBannerEditPanel"/>
1921+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1922+
<argument name="property" value="PageBuilderBannerAppearance_Poster"/>
1923+
</actionGroup>
1924+
<actionGroup ref="addTextToTinyMCE" stepKey="enterMessageText">
1925+
<argument name="property" value="PageBuilderBannerMessageProperty"/>
1926+
<argument name="section" value="BannerOnConfigurationPanel"/>
1927+
</actionGroup>
1928+
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowButton">
1929+
<argument name="property" value="PageBuilderBannerShowButtonAlwaysProperty"/>
1930+
</actionGroup>
1931+
<actionGroup ref="selectSlideOutPanelField" stepKey="selectButtonType">
1932+
<argument name="property" value="PageBuilderBannerButtonTypePrimaryProperty"/>
1933+
</actionGroup>
1934+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterButtonText">
1935+
<argument name="property" value="PageBuilderBannerButtonTextProperty"/>
1936+
</actionGroup>
1937+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignmentDefault">
1938+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyDefault"/>
1939+
</actionGroup>
1940+
<actionGroup ref="saveEditPanelSettings" stepKey="saveBannerEditPanelSettings"/>
1941+
<executeJS function="return {{BannerOnBackend.overlayJS('1')}}.getBoundingClientRect().left" stepKey="overlayLeftPosition"/>
1942+
<executeJS function="return document.evaluate(&quot;{{BannerOnBackend.button('1')}}&quot;, document.body).iterateNext().getBoundingClientRect().left" stepKey="buttonLeftPosition"/>
1943+
<executeJS function="return Math.abs(Math.round({$buttonLeftPosition}-{$overlayLeftPosition}-{{PageBuilderPaddingProperty40.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPadding"/>
1944+
<assertLessThanOrEqual stepKey="assertButtonLeftAligned">
1945+
<expectedResult type="int">5</expectedResult>
1946+
<actualResult type="variable">buttonMinusOverlayMinusPadding</actualResult>
1947+
</assertLessThanOrEqual>
1948+
<executeJS function="return window.getComputedStyle({{BannerOnBackend.wrapperJS('1')}}).textAlign" stepKey="grabDefaultComputedTextAlign"/>
1949+
<assertEquals stepKey="assertDefaultComputedTextAlign">
1950+
<expectedResult type="string">{{PageBuilderAdvancedAlignmentPropertyStart.value}}</expectedResult>
1951+
<actualResult type="variable">grabDefaultComputedTextAlign</actualResult>
1952+
</assertEquals>
1953+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusBannerEditor"/>
1954+
<!-- Fill Out Row Edit Panel -->
1955+
<comment userInput="Fill Out Row Edit Panel" stepKey="commentFillRowEditPanel"/>
1956+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openRowEditMenuOnStage">
1957+
<argument name="contentType" value="PageBuilderRowContentType"/>
1958+
</actionGroup>
1959+
<comment userInput="Update Values" stepKey="commentUpdateValues"/>
1960+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignment">
1961+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyRight"/>
1962+
</actionGroup>
1963+
<actionGroup ref="saveEditPanelSettings" stepKey="saveRowEditPanelSettings"/>
1964+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusRowEditor"/>
1965+
<!-- Validate Stage -->
1966+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
1967+
<executeJS function="return {{BannerOnBackend.overlayJS('1')}}.getBoundingClientRect().right" stepKey="overlayRightPosition"/>
1968+
<executeJS function="return document.evaluate(&quot;{{BannerOnBackend.button('1')}}&quot;, document.body).iterateNext().getBoundingClientRect().right" stepKey="buttonRightPosition"/>
1969+
<executeJS function="return Math.abs(Math.round({$overlayRightPosition}-{$buttonRightPosition}-{{PageBuilderPaddingProperty40.paddingRight}}))" stepKey="overlayMinusButtonMinusPadding"/>
1970+
<assertLessThanOrEqual stepKey="assertButtonRightAligned">
1971+
<expectedResult type="int">5</expectedResult>
1972+
<actualResult type="variable">overlayMinusButtonMinusPadding</actualResult>
1973+
</assertLessThanOrEqual>
1974+
<executeJS function="return window.getComputedStyle({{BannerOnBackend.wrapperJS('1')}}).textAlign" stepKey="grabComputedTextAlign"/>
1975+
<assertEquals stepKey="assertComputedTextAlign">
1976+
<expectedResult type="string">{{PageBuilderAdvancedAlignmentPropertyRight.value}}</expectedResult>
1977+
<actualResult type="variable">grabComputedTextAlign</actualResult>
1978+
</assertEquals>
1979+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1980+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1981+
<!-- Validate Stage After Save -->
1982+
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
1983+
<executeJS function="return {{BannerOnBackend.overlayJS('1')}}.getBoundingClientRect().right" stepKey="overlayRightPositionAfterSave"/>
1984+
<executeJS function="return document.evaluate(&quot;{{BannerOnBackend.button('1')}}&quot;, document.body).iterateNext().getBoundingClientRect().right" stepKey="buttonRightPositionAfterSave"/>
1985+
<executeJS function="return Math.abs(Math.round({$overlayRightPositionAfterSave}-{$buttonRightPositionAfterSave}-{{PageBuilderPaddingProperty40.paddingRight}}))" stepKey="overlayMinusButtonMinusPaddingAfterSave"/>
1986+
<assertLessThanOrEqual stepKey="assertButtonRightAlignedAfterSave">
1987+
<expectedResult type="int">5</expectedResult>
1988+
<actualResult type="variable">overlayMinusButtonMinusPaddingAfterSave</actualResult>
1989+
</assertLessThanOrEqual>
1990+
<executeJS function="return window.getComputedStyle({{BannerOnBackend.wrapperJS('1')}}).textAlign" stepKey="grabComputedTextAlignAfterSave"/>
1991+
<assertEquals stepKey="assertComputedTextAlignAfterSave">
1992+
<expectedResult type="string">{{PageBuilderAdvancedAlignmentPropertyRight.value}}</expectedResult>
1993+
<actualResult type="variable">grabComputedTextAlignAfterSave</actualResult>
1994+
</assertEquals>
1995+
<!-- Validate Storefront -->
1996+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1997+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1998+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1999+
</actionGroup>
2000+
<executeJS function="return {{BannerOnFrontend.overlayJS('1')}}.getBoundingClientRect().right" stepKey="overlayRightPositionStoreFront"/>
2001+
<executeJS function="return document.evaluate(&quot;{{BannerOnFrontend.button('1')}}&quot;, document.body).iterateNext().getBoundingClientRect().right" stepKey="buttonRightPositionStoreFront"/>
2002+
<executeJS function="return Math.abs(Math.round({$overlayRightPositionStoreFront}-{$buttonRightPositionStoreFront}-{{PageBuilderPaddingProperty40.paddingRight}}))" stepKey="overlayMinusButtonMinusPaddingStoreFront"/>
2003+
<assertLessThanOrEqual stepKey="assertButtonRightAlignedStoreFront">
2004+
<expectedResult type="int">5</expectedResult>
2005+
<actualResult type="variable">overlayMinusButtonMinusPaddingStoreFront</actualResult>
2006+
</assertLessThanOrEqual>
2007+
<executeJS function="return window.getComputedStyle({{BannerOnFrontend.wrapperJS('1')}}).textAlign" stepKey="grabComputedTextAlignStoreFront"/>
2008+
<assertEquals stepKey="assertComputedTextAlignStoreFront">
2009+
<expectedResult type="string">{{PageBuilderAdvancedAlignmentPropertyRight.value}}</expectedResult>
2010+
<actualResult type="variable">grabComputedTextAlignStoreFront</actualResult>
2011+
</assertEquals>
2012+
</test>
18842013
</tests>

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,4 +682,25 @@
682682
<argument name="diffThreshold" value="0"/>
683683
</actionGroup>
684684
</test>
685+
<test name="SliderCollageCenterAlignmentInheritance" extends="SliderPosterAlignmentInheritance">
686+
<annotations>
687+
<features value="PageBuilder"/>
688+
<stories value="Slider"/>
689+
<title value="Collage Center - Alignment Inherits"/>
690+
<description value="A user should be able to have a parent container content type pass its alignment to its children"/>
691+
<severity value="MAJOR"/>
692+
<useCaseId value="MC-4290"/>
693+
<testCaseId value="MC-6025"/>
694+
<group value="pagebuilder"/>
695+
<group value="pagebuilder-slide"/>
696+
<group value="pagebuilder-sliderCollageCenter"/>
697+
</annotations>
698+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
699+
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>
700+
</actionGroup>
701+
<executeJS function="return Math.abs(Math.round({$buttonLeftPosition}-{$overlayLeftPosition}-30))" stepKey="buttonMinusOverlayMinusPadding"/>
702+
<executeJS function="return Math.abs(Math.round({$overlayRightPosition}-{$buttonRightPosition}-30))" stepKey="overlayMinusButtonMinusPadding"/>
703+
<executeJS function="return Math.abs(Math.round({$overlayRightPositionAfterSave}-{$buttonRightPositionAfterSave}-30))" stepKey="overlayMinusButtonMinusPaddingAfterSave"/>
704+
<executeJS function="return Math.abs(Math.round({$overlayRightPositionStoreFront}-{$buttonRightPositionStoreFront}-30))" stepKey="overlayMinusButtonMinusPaddingStoreFront"/>
705+
</test>
685706
</tests>

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,4 +555,25 @@
555555
<argument name="diffThreshold" value="0"/>
556556
</actionGroup>
557557
</test>
558+
<test name="SliderCollageLeftAlignmentInheritance" extends="SliderPosterAlignmentInheritance">
559+
<annotations>
560+
<features value="PageBuilder"/>
561+
<stories value="Slider"/>
562+
<title value="Collage Left - Alignment Inherits"/>
563+
<description value="A user should be able to have a parent container content type pass its alignment to its children"/>
564+
<severity value="MAJOR"/>
565+
<useCaseId value="MC-4290"/>
566+
<testCaseId value="MC-6024"/>
567+
<group value="pagebuilder"/>
568+
<group value="pagebuilder-slide"/>
569+
<group value="pagebuilder-sliderCollageLeft"/>
570+
</annotations>
571+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
572+
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
573+
</actionGroup>
574+
<executeJS function="return Math.abs(Math.round({$buttonLeftPosition}-{$overlayLeftPosition}-30))" stepKey="buttonMinusOverlayMinusPadding"/>
575+
<executeJS function="return Math.abs(Math.round({$overlayRightPosition}-{$buttonRightPosition}-30))" stepKey="overlayMinusButtonMinusPadding"/>
576+
<executeJS function="return Math.abs(Math.round({$overlayRightPositionAfterSave}-{$buttonRightPositionAfterSave}-30))" stepKey="overlayMinusButtonMinusPaddingAfterSave"/>
577+
<executeJS function="return Math.abs(Math.round({$overlayRightPositionStoreFront}-{$buttonRightPositionStoreFront}-30))" stepKey="overlayMinusButtonMinusPaddingStoreFront"/>
578+
</test>
558579
</tests>

0 commit comments

Comments
 (0)