Skip to content

Commit f4528ed

Browse files
authored
Merge pull request #120 from magento-obsessive-owls/PR
[CMS Team 1] Bugs
2 parents ca55d9b + 38a73fe commit f4528ed

File tree

23 files changed

+358
-39
lines changed

23 files changed

+358
-39
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
<element name="firstSlideNavigationDot" type="button" selector="(//div[contains(@class, 'navigation-dot')])[1]"/>
3333
<element name="activeSlideTooltip" type="button" selector="//div[contains(@class, 'navigation-dot')]//span[contains(@role, 'tooltip')]"/>
3434
<element name="slideNavigationDot" type="button" selector="(//div[contains(@class, 'navigation-dot')])[{{arg1}}]" parameterized="true"/>
35+
<element name="slideNavigationDragHandle" type="button" selector="a.navigation-dot-anchor"/>
36+
<element name="slideNavigationDragHandleByIndex" type="button" selector="(//a[contains(@class, 'navigation-dot-anchor')])[{{arg1}}]" parameterized="true"/>
3537
<element name="allNavigationDots" type="button" selector="(//div[contains(@class, 'navigation-dot')])"/>
3638
<element name="activeSlideNavigationDot" type="button" selector="//div[contains(@class, 'navigation-dot active')]"/>
3739
<element name="slideNavigationDotNameTooltip" type="button" selector="(//span[contains(@class, 'tooltip-content')])"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<element name="contentTypeWithIcon" type="button" selector="//ul[@class='pagebuilder-panel-groups']//span[@class='content-type-icon']//i[@class='icon-pagebuilder-{{arg2}}']/../following-sibling::span[text()='{{arg1}}']" parameterized="true"/>
6464
</section>
6565
<section name="PageBuilderContentTypeOptionsMenu">
66-
<element name="contentTypeOptionsMenu" type="button" selector='div.pagebuilder-{{arg1}}.pagebuilder-content-type > div.pagebuilder-options' parameterized="true"/>
66+
<element name="contentTypeOptionsMenu" type="button" selector='(//div[contains(@class, "pagebuilder-{{arg1}}")]//div[contains(@class, "pagebuilder-options")])[1]' parameterized="true"/>
6767
<element name="contentTypeOptionsMenuByIndex" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-{{arg1}}")])[{{arg2}}]//div[contains(@class,"pagebuilder-options-visible")]' parameterized="true"/>
6868
<element name="contentTypeMove" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-{{arg1}}")])[1]/div[contains(@class,"pagebuilder-options-visible")]/descendant::*[@class="move-structural"]' parameterized="true"/>
6969
<element name="contentTypeMoveByIndex" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-{{arg1}}")])[{{arg2}}]/div[contains(@class,"pagebuilder-options-visible")]/descendant::*[@class="move-structural"]' parameterized="true"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<element name="tabHeader" type="button" selector="(//li[contains(@role, 'tab')])[{{arg1}}]" parameterized="true"/>
6565
<element name="tabHeaderItemActive" type="button" selector="(//div[@data-role='tabs']//descendant::*[@role='tablist'])/li[{{arg1}}][contains(@class, 'ui-state-active')]" parameterized="true"/>
6666
<element name="tabPanel" type="button" selector="(//div[@class='tabs-content']//div[@role='tabpanel'])[{{arg1}}]" parameterized="true"/>
67-
<element name="tabContent" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}]" parameterized="true"/>
67+
<element name="tabContent" type="button" selector="div.tabs-content div[data-role=tab-item]:nth-child({{arg1}})" parameterized="true"/>
6868
<element name="tabContentAdvancedStyles" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}][@style='border-radius: 0px 12px 12px; border: 10px solid rgb(0, 0, 0);']" parameterized="true"/>
6969
<element name="tabContentMinimumHeight" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}][contains(@style, 'min-height: {{arg2}}px')]" parameterized="true"/>
7070
<element name="tabContentBackgroundColor" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}][contains(@style, 'background-color: {{arg2}}')]" parameterized="true"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1956,7 +1956,7 @@
19561956
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
19571957
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
19581958
</actionGroup>
1959-
<executeJS function="return parseInt(window.getComputedStyle(document.querySelectorAll('{{TabOnStorefront.all}}')[0]).width)" stepKey="tabWidthStorefront"/>
1959+
<executeJS function="return document.querySelectorAll('{{TabOnStorefront.all}}')[0].offsetWidth" stepKey="tabWidthStorefront"/>
19601960
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefront"/>
19611961
<assertLessThan stepKey="assertButtonSmallerThanTabStorefront">
19621962
<expectedResult type="variable">$tabWidthStorefront</expectedResult>
@@ -1969,7 +1969,7 @@
19691969
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
19701970
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
19711971
</actionGroup>
1972-
<executeJS function="return parseInt(window.getComputedStyle(document.querySelectorAll('{{TabOnStorefront.all}}')[0]).width)" stepKey="tabWidthStorefrontMobile"/>
1972+
<executeJS function="return document.querySelectorAll('{{TabOnStorefront.all}}')[0].offsetWidth" stepKey="tabWidthStorefrontMobile"/>
19731973
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefrontMobile"/>
19741974
<assertLessThan stepKey="assertButtonSmallerThanTabStorefrontMobile">
19751975
<expectedResult type="variable">$tabWidthStorefrontMobile</expectedResult>

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

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1938,4 +1938,145 @@
19381938
<seeElementInDOM selector="{{SlideOnBackend.emptyslide}}" stepKey="seeEmptySliderOnStage"/>
19391939
<dontSeeElementInDOM selector="{{SlideOnBackend.slideBackgroundImage('0',PageBuilderSlideBackgroundImageProperty2.path, PageBuilderSlideBackgroundImageProperty1.extension)}}" stepKey="dontSeeImageInrMainImageSource1"/>
19401940
</test>
1941+
<test name="SliderSorting">
1942+
<annotations>
1943+
<features value="PageBuilder"/>
1944+
<stories value="Slider"/>
1945+
<title value="Can sort slides using drag and drop"/>
1946+
<description value="A user should be able to manage slides order by using drag and drop"/>
1947+
<severity value="CRITICAL"/>
1948+
<useCaseId value="MC-3314"/>
1949+
<testCaseId value="MC-2957"/>
1950+
<group value="pagebuilder"/>
1951+
<group value="pagebuilder-slider"/>
1952+
<group value="pagebuilder-sliderCommon"/>
1953+
</annotations>
1954+
<before>
1955+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1956+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1957+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1958+
</before>
1959+
<after>
1960+
<actionGroup ref="logout" stepKey="logout"/>
1961+
</after>
1962+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1963+
<argument name="contentType" value="PageBuilderSliderContentType"/>
1964+
</actionGroup>
1965+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1966+
<argument name="group" value="PageBuilderSliderContentType"/>
1967+
</actionGroup>
1968+
1969+
<!-- Add Slider to Stage -->
1970+
<comment userInput="User adds Slider into the content, user sees first Slide to be displayed inside the slider" stepKey="addSliderToStage"/>
1971+
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragSliderIntoStage">
1972+
<argument name="contentType" value="PageBuilderSliderContentType"/>
1973+
</actionGroup>
1974+
1975+
<!-- Fill first slide data -->
1976+
<comment userInput="Fill first slide data." stepKey="fillSlide1"/>
1977+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterSlideNameText1">
1978+
<argument name="property" value="PageBuilderSlideItemName1"/>
1979+
</actionGroup>
1980+
<actionGroup ref="addTextToTinyMCE" stepKey="addTextToTinyMCE">
1981+
<argument name="property" value="PageBuilderSlideItemContent1"/>
1982+
<argument name="section" value="SlideOnConfigurationPanel"/>
1983+
</actionGroup>
1984+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel1Settings"/>
1985+
1986+
<!-- Validate first slide -->
1987+
<comment userInput="User sees Slide on stage with updated title and content." stepKey="checkFilledData"/>
1988+
<click stepKey="unfocusNavigation" selector="{{SliderInAdmin.sliderContainer}}"/>
1989+
<moveMouseOver selector="{{SliderInAdmin.activeSlideNavigationDot}}" stepKey="mouseOverActiveSlide"/>
1990+
<see userInput="{{PageBuilderSlideItemName1.value}}" selector="{{SliderInAdmin.slideNavigationDotNameTooltip}}" stepKey="seeSlideNameInTooltip"/>
1991+
<see userInput="{{PageBuilderSlideItemContent1.value}}" selector="{{SlideOnBackend.slideContent('0')}}" stepKey="seeSlide1ContentDisplayedAdmin"/>
1992+
1993+
<!-- Add second slide -->
1994+
<comment userInput="User clicks (+) icon, sees new slide added to to the right." stepKey="addSecondSlide"/>
1995+
<actionGroup ref="addSlide" stepKey="addSlide2"/>
1996+
1997+
<!-- Fill second slide data -->
1998+
<comment userInput="Fill second slide data." stepKey="fillSlide2"/>
1999+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterSlideNameText2">
2000+
<argument name="property" value="PageBuilderSlideItemName2"/>
2001+
</actionGroup>
2002+
<actionGroup ref="addTextToTinyMCE" stepKey="addTextToTinyMCESlide2">
2003+
<argument name="property" value="PageBuilderSlideItemContent2"/>
2004+
<argument name="section" value="SlideOnConfigurationPanel"/>
2005+
</actionGroup>
2006+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel1Settings2"/>
2007+
2008+
<!-- Validate second slide data -->
2009+
<comment userInput="User sees Second Slide on stage with updated title and content." stepKey="checkFilledData2"/>
2010+
<click stepKey="unfocusNavigation2" selector="{{SliderInAdmin.sliderContainer}}"/>
2011+
<moveMouseOver selector="{{SliderInAdmin.activeSlideNavigationDot}}" stepKey="mouseOverActiveSlide2"/>
2012+
<see userInput="{{PageBuilderSlideItemName2.value}}" selector="{{SliderInAdmin.slideNavigationDotNameTooltip}}" stepKey="seeSlideName2InTooltip"/>
2013+
<see userInput="{{PageBuilderSlideItemContent2.value}}" selector="{{SlideOnBackend.slideContent('1')}}" stepKey="seeSlide2ContentDisplayedAdmin"/>
2014+
2015+
<!-- Save Page-->
2016+
<comment userInput="Save page" stepKey="savePage"/>
2017+
<scrollTo selector="{{CmsNewPagePageActionsSection.pageTitle}}" stepKey="scrollToTop1"/>
2018+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
2019+
2020+
<!-- Validate Stage-->
2021+
<comment userInput="Validate saved data" stepKey="validateSavedData"/>
2022+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage1"/>
2023+
<see userInput="{{PageBuilderSlideItemContent1.value}}" selector="{{SlideOnBackend.slideContent('0')}}" stepKey="seeSlideContentAfterSave"/>
2024+
<click selector="{{SliderInAdmin.sliderContainer}}" stepKey="unfocusNavigationAfterSave"/>
2025+
<moveMouseOver selector="{{SliderInAdmin.activeSlideNavigationDot}}" stepKey="mouseOverActiveSlide1AfterSave"/>
2026+
<see userInput="{{PageBuilderSlideItemName1.value}}" selector="{{SliderInAdmin.slideNavigationDotNameTooltip}}" stepKey="seeSlideName1InTooltipAfterSave"/>
2027+
<moveMouseOver selector="{{SliderInAdmin.slideNavigationDot('2')}}" stepKey="moveMouseOverSecondSlideNavigationDotAfterSave"/>
2028+
<see userInput="{{PageBuilderSlideItemName2.value}}" selector="{{SliderInAdmin.slideNavigationDotNameTooltip}}" stepKey="seeSlideName2InTooltipAfterSave"/>
2029+
<click selector="{{SliderInAdmin.slideNavigationDot('2')}}" stepKey="clickSecondNavigationDot"/>
2030+
<see userInput="{{PageBuilderSlideItemContent2.value}}" selector="{{SlideOnBackend.slideContent('1')}}" stepKey="seeSecondSlideContentAfterSave"/>
2031+
2032+
<!-- Drag and drop second slide to first position -->
2033+
<comment userInput="User sorts slides using drag and drop" stepKey="sortingSlides"/>
2034+
<executeJS function="return document.querySelectorAll('{{SliderInAdmin.slideNavigationDragHandle}}')[0].clientWidth / 4" stepKey="xCoordinateToMoveTo"/>
2035+
<comment userInput="xCoordinateToMoveTo: $xCoordinateToMoveTo" stepKey="commentXCoordinate"/>
2036+
<executeJS function="return document.querySelectorAll('{{SliderInAdmin.slideNavigationDragHandle}}')[0].clientHeight / 2" stepKey="yCoordinateToMoveTo"/>
2037+
<comment userInput="yCoordinateToMoveTo: $yCoordinateToMoveTo" stepKey="commentYCoordinate"/>
2038+
<click selector="{{SliderInAdmin.slideNavigationDot('2')}}" stepKey="clickButton"/>
2039+
<dragAndDrop selector1="{{SliderInAdmin.slideNavigationDragHandleByIndex('2')}}" selector2="{{SliderInAdmin.slideNavigationDot('1')}}" x="$xCoordinateToMoveTo" y="$yCoordinateToMoveTo" stepKey="dragAndDropSlide"/>
2040+
2041+
<!-- Validate content after sorting -->
2042+
<comment userInput="User sees content of active slide is equal to second slide content" stepKey="AC17"/>
2043+
<see userInput="{{PageBuilderSlideItemContent2.value}}" selector="{{SlideOnBackend.slideContent('0')}}" stepKey="seeSlide2ContentAfterSort"/>
2044+
2045+
<!-- Validate Side names after sorting -->
2046+
<comment userInput="User hovers each slide dot, user sees tooltip displayed with Slide name after sorting" stepKey="checkAfterSort"/>
2047+
<click selector="{{SliderInAdmin.sliderContainer}}" stepKey="unfocusNavigationAfterSort"/>
2048+
<moveMouseOver selector="{{SliderInAdmin.activeSlideNavigationDot}}" stepKey="mouseOverActiveSlide2AfterSort"/>
2049+
<see userInput="{{PageBuilderSlideItemName2.value}}" selector="{{SliderInAdmin.slideNavigationDotNameTooltip}}" stepKey="seeSlideName2InTooltipAfterSort"/>
2050+
<moveMouseOver selector="{{SliderInAdmin.slideNavigationDot('2')}}" stepKey="moveMouseOverSecondSlideNavigationDot"/>
2051+
<see userInput="{{PageBuilderSlideItemName1.value}}" selector="{{SliderInAdmin.slideNavigationDotNameTooltip}}" stepKey="seeSlideName1InTooltipAfterSort"/>
2052+
2053+
<!-- Save Page-->
2054+
<comment userInput="Save page" stepKey="savePage1"/>
2055+
<scrollTo selector="{{CmsNewPagePageActionsSection.pageTitle}}" stepKey="scrollToTop"/>
2056+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage1"/>
2057+
2058+
<!-- Validate Stage-->
2059+
<comment userInput="Validate saved data" stepKey="validateSavedData2"/>
2060+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
2061+
<see userInput="{{PageBuilderSlideItemContent2.value}}" selector="{{SlideOnBackend.slideContent('0')}}" stepKey="seeSlide2ContentAfterSave"/>
2062+
<click selector="{{SliderInAdmin.sliderContainer}}" stepKey="unfocusNavigationAfterSave2"/>
2063+
<moveMouseOver selector="{{SliderInAdmin.activeSlideNavigationDot}}" stepKey="mouseOverActiveSlide2AfterSave"/>
2064+
<see userInput="{{PageBuilderSlideItemName2.value}}" selector="{{SliderInAdmin.slideNavigationDotNameTooltip}}" stepKey="seeSlideName2InTooltipAfterSave2"/>
2065+
<moveMouseOver selector="{{SliderInAdmin.slideNavigationDot('2')}}" stepKey="moveMouseOverSecondSlideNavigationDotAfterSave2"/>
2066+
<see userInput="{{PageBuilderSlideItemName1.value}}" selector="{{SliderInAdmin.slideNavigationDotNameTooltip}}" stepKey="seeSlideName1InTooltipAfterSave2"/>
2067+
<click selector="{{SliderInAdmin.slideNavigationDot('2')}}" stepKey="clickSecondNavigationDot2"/>
2068+
<see userInput="{{PageBuilderSlideItemContent1.value}}" selector="{{SlideOnBackend.slideContent('1')}}" stepKey="seeSlideContentAfterSave2"/>
2069+
2070+
<!-- Validate Storefront -->
2071+
<comment userInput="Validate Slider on Storefront" stepKey="commentValidateStorefront"/>
2072+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
2073+
<argument name="contentType" value="PageBuilderSliderContentType"/>
2074+
</actionGroup>
2075+
<waitForElementVisible selector="{{SliderOnFrontend.SliderDisplay}}" stepKey="seeSliderOnPageBuilderPage"/>
2076+
<seeElement selector="{{SlideOnFrontend.slide('1')}}" stepKey="seeSlide1InSlider"/>
2077+
<see userInput="{{PageBuilderSlideItemContent2.value}}" selector="{{SlideOnFrontend.slideContent('0')}}" stepKey="seeSlide1ContentDisplayed"/>
2078+
<click selector="{{SliderOnFrontend.slideNavigator('2')}}" stepKey="clickNextSlideOnSlider"/>
2079+
<waitForElementVisible time="2" selector="{{SlideOnFrontend.slide2}}" stepKey="waitForSlide2" />
2080+
<see userInput="{{PageBuilderSlideItemContent1.value}}" selector="{{SlideOnFrontend.slideContent('1')}}" stepKey="seeSlide2ContentDisplayed"/>
2081+
</test>
19412082
</tests>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
<assertEquals expected="{{PageBuilderTabBackgroundAttachmentDefault.optionsList}}" expectedType="array" actual="grabBackgroundAttachmentOptions" actualType="variable" message="Verify Background Attachment dropdown options" stepKey="assertBackgroundAttachmentOptions"/>
121121
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettingsForTab1"/>
122122
<!-- Validate Default Values in Edit Tabs -->
123+
<click selector="{{TabsOnStage.tabsContainer}}" stepKey="focusOnContentType"/>
123124
<actionGroup ref="openPageBuilderEditPanel" stepKey="openTabsEditMenuOnStage">
124125
<argument name="contentType" value="PageBuilderTabsContentType"/>
125126
</actionGroup>
@@ -598,6 +599,13 @@
598599
<see selector="{{TabOnStorefront.tabHeader('2')}}" userInput="{{PageBuilderTabNameRandom2.value}}" stepKey="seeTab2TitleStorefront"/>
599600
<seeElement selector="{{TabOnStorefront.tabContentBackgroundColor('2', PageBuilderTabBackgroundColorGreen.rgb)}}" stepKey="seeTab2BackgroundColor"/>
600601
<seeElement selector="{{TabOnStorefront.tabContentMinimumHeight('2', PageBuilderTabMinimumHeight600Property.value)}}" stepKey="seeTab2MinHeight"/>
602+
<comment userInput="User sees Tab 2 with height that equals to sum of min-height + paddingTop + paddingBottom" stepKey="verifyMinHeight"/>
603+
<executeJS function="return {{PageBuilderTabMinimumHeight600Property.value}} + {{PageBuilderPaddingProperty40.paddingTop}} + {{PageBuilderPaddingProperty40.paddingBottom}}" stepKey="tab2ExpectedHeight"/>
604+
<executeJS function="return document.querySelector('{{TabOnStorefront.tabContent('2')}}').offsetHeight" stepKey="tab2Height"/>
605+
<assertEquals stepKey="assertTabMinHeight">
606+
<expectedResult type="variable">tab2ExpectedHeight</expectedResult>
607+
<actualResult type="variable">tab2Height</actualResult>
608+
</assertEquals>
601609
</test>
602610
<test name="AddTabsWithBackgroundJpgTopCoverScrollFixedNoBackgroundRepeat">
603611
<annotations>

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/_preview.less

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,20 @@
5353
}
5454

5555
&.empty-placeholder {
56+
left: 0;
57+
text-align: center;
58+
z-index: 1;
59+
}
60+
61+
&.empty-placeholder-background {
5662
-moz-transition: .3s;
5763
-webkit-transition: .3s;
5864
background: url('@{baseDir}Magento_PageBuilder/css/images/cms-empty-row.svg') no-repeat center center;
5965
background-size: 505px 97px;
6066
height: 170px;
61-
left: 0;
6267
padding-top: 130px;
6368
position: absolute;
64-
text-align: center;
6569
transition: .3s;
66-
width: 100%;
6770
}
6871
}
6972

0 commit comments

Comments
 (0)