Skip to content

Commit a19fc15

Browse files
committed
Merge branch 'MC-5773-mftf-schedule' into cms-team-1-delivery
2 parents e30633f + a6d92dd commit a19fc15

10 files changed

+141
-9
lines changed

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,25 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="navigateToCMSPage">
12+
<!-- This goes in CE repo -->
13+
<arguments>
14+
<argument name="CMSPage"/>
15+
</arguments>
16+
<amOnPage url="{{CmsPagesPage.url}}" stepKey="navigateToCMSPagesGrid"/>
17+
<waitForPageLoad stepKey="waitForPageLoad1"/>
18+
<conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" visible="true" stepKey="clickToResetFilter"/>
19+
<waitForPageLoad stepKey="waitForGridLoad"/>
20+
<conditionalClick selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" visible="true" stepKey="clickToAttemptSortByIdDescending"/>
21+
<waitForPageLoad stepKey="waitForFirstIdSortDescendingToFinish"/>
22+
<!-- Conditional Click again in case it goes from default state to ascending on first click -->
23+
<conditionalClick selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" visible="true" stepKey="secondClickToAttemptSortByIdDescending"/>
24+
<waitForPageLoad stepKey="waitForSecondIdSortDescendingToFinish"/>
25+
<click selector="{{CmsPagesPageActionsSection.select(CMSPage.identifier)}}" stepKey="clickSelectCreatedCMSPage"/>
26+
<click selector="{{CmsPagesPageActionsSection.edit(CMSPage.identifier)}}" stepKey="navigateToCreatedCMSPage"/>
27+
<waitForPageLoad stepKey="waitForPageLoad2"/>
28+
<seeElement selector="{{CmsNewPagePageContentSection.header}}" stepKey="seeContentSectionHeaderForPage"/>
29+
</actionGroup>
1130
<actionGroup name="navigateToAPageWithPageBuilder">
1231
<waitForPageLoad stepKey="waitForDashboardPageLoad"/>
1332
<amOnPage url="{{CmsPagesPage.url}}/new" stepKey="amOnPageBuilderPage"/>

app/code/Magento/PageBuilder/Test/Mftf/Data/SlideData.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727
<data key="fieldName">slide_name</data>
2828
<data key="value">Slide 2 Name</data>
2929
</entity>
30+
<entity name="PageBuilderSlideItemSlideName_Slide3" type="pagebuilder_slide_item_slide_name_property">
31+
<data key="name">Name</data>
32+
<data key="section">appearance_fieldset</data>
33+
<data key="fieldName">slide_name</data>
34+
<data key="value">Slide 3 Name</data>
35+
</entity>
3036
<entity name="PageBuilderSlideItemSlideName_HtmlCode" type="pagebuilder_slide_item_slide_name_property">
3137
<data key="name">Name</data>
3238
<data key="section">appearance_fieldset</data>
@@ -232,6 +238,12 @@
232238
<data key="fieldName">content</data>
233239
<data key="value">Slide 2 Content</data>
234240
</entity>
241+
<entity name="PageBuilderSlideItemContent_Slide3" type="pagebuilder_slide_item_content_property">
242+
<data key="name">Content</data>
243+
<data key="section">general</data>
244+
<data key="fieldName">content</data>
245+
<data key="value">Slide 3 Content</data>
246+
</entity>
235247
<entity name="PageBuilderSlideItemMessage_Empty" type="pagebuilder_slide_item_message_property">
236248
<data key="name">Message Text</data>
237249
<data key="section">contents</data>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,8 @@
2121
<element name="related" type="button" selector=".block.related"/>
2222
<element name="upsell" type="button" selector=".block.upsell"/>
2323
</section>
24+
<section name="CategoryContentSection">
25+
<!-- This goes in CE repo -->
26+
<element name="descriptionTextArea" type="text" selector="#category_form_description"/>
27+
</section>
2428
</sections>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,12 @@
8181
<actionGroup ref="logout" stepKey="logout"/>
8282
</after>
8383
<seeElement selector="{{PageBuilderStage.stageWrapper}}" stepKey="seeElementPageBuilderStage"/>
84+
<dontSeeElementInDOM selector="{{CmsNewBlockBlockBasicFieldsSection.content_textarea}}" stepKey="dontSeeContentAreaInDOM"/>
8485
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
8586
<actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage">
8687
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
8788
</actionGroup>
89+
<seeElementInDOM selector="{{CmsNewBlockBlockBasicFieldsSection.content_textarea}}" stepKey="seeContentAreaInDOM"/>
8890
<dontSeeElementInDOM selector="{{PageBuilderStage.stageWrapper}}" stepKey="dontSeePageBuilderStage"/>
8991
</test>
9092
</tests>

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,41 @@
111111
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="disableWYSIWYG"/>
112112
</after>
113113
</test>
114+
<test name="PageBuilderCmsPageDisablePageBuilder">
115+
<annotations>
116+
<features value="PageBuilder"/>
117+
<stories value="CMS Page"/>
118+
<title value="Verify PageBuilder does not appear when disabled in CMS Page"/>
119+
<description value="This test is intended to ensure that PageBuilder does not appear when disabled for CMS Page."/>
120+
<severity value="CRITICAL"/>
121+
<useCaseId value="MC-5773"/>
122+
<testCaseId value="MC-14965"/>
123+
<group value="pagebuilder"/>
124+
<group value="pagebuilder-disable"/>
125+
<group value="pagebuilder-cms-page"/>
126+
</annotations>
127+
<before>
128+
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
129+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
130+
<actionGroup ref="navigateToCMSPage" stepKey="navigateToCMSPage">
131+
<argument name="CMSPage" value="$$createCMSPage$$"/>
132+
</actionGroup>
133+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
134+
</before>
135+
<after>
136+
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
137+
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
138+
<actionGroup ref="logout" stepKey="logout"/>
139+
</after>
140+
<seeElement selector="{{PageBuilderStage.stageWrapper}}" stepKey="seeElementPageBuilderStage"/>
141+
<dontSeeElementInDOM selector="{{CmsNewPagePageContentSection.content}}" stepKey="dontSeeContentAreaInDOM"/>
142+
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
143+
<actionGroup ref="navigateToCMSPage" stepKey="navigateToCMSPage">
144+
<argument name="CMSPage" value="$$createCMSPage$$"/>
145+
</actionGroup>
146+
<conditionalClick selector="{{CmsNewPagePageContentSection.header}}" dependentSelector="{{CmsNewPagePageContentSection.header}}._show" visible="false" stepKey="expandSection"/>
147+
<waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
148+
<seeElementInDOM selector="{{CmsNewPagePageContentSection.content}}" stepKey="seeContentAreaInDOM"/>
149+
<dontSeeElementInDOM selector="{{PageBuilderStage.stageWrapper}}" stepKey="dontSeePageBuilderStage"/>
150+
</test>
114151
</tests>

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,40 @@
2323
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="disableWYSIWYG"/>
2424
</after>
2525
</test>
26+
<test name="PageBuilderCatalogCategoryDisablePageBuilder">
27+
<annotations>
28+
<features value="PageBuilder"/>
29+
<stories value="Catalog Category"/>
30+
<title value="Verify PageBuilder Does Not Appear When Disabled"/>
31+
<description value="This test is intended to ensure that PageBuilder does not appear when disabled for Catalog Category."/>
32+
<severity value="CRITICAL"/>
33+
<useCaseId value="MC-5773"/>
34+
<testCaseId value="MC-14961"/>
35+
<group value="pagebuilder"/>
36+
<group value="pagebuilder-disable"/>
37+
<group value="pagebuilder-catalog-category"/>
38+
</annotations>
39+
<before>
40+
<createData entity="_defaultCategory" stepKey="createCategory"/>
41+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
42+
<actionGroup ref="navigateToCreatedCategory" stepKey="navigateToCreatedCategory">
43+
<argument name="Category" value="$$createCategory$$"/>
44+
</actionGroup>
45+
<actionGroup ref="expandAdminProductSection" stepKey="expandAdminProductSection"/>
46+
</before>
47+
<after>
48+
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
49+
<deleteData createDataKey="createCategory" stepKey="deleteCreatedCategory"/>
50+
<actionGroup ref="logout" stepKey="logout"/>
51+
</after>
52+
<seeElement selector="{{PageBuilderProductAttribute.PageBuilderBtn('description')}}" stepKey="seePageBuilderButton"/>
53+
<dontSeeElementInDOM selector="{{CategoryContentSection.descriptionTextArea}}" stepKey="dontSeeDescriptionAreaInDOM"/>
54+
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
55+
<actionGroup ref="navigateToCreatedCategory" stepKey="navigateToCreatedCategory">
56+
<argument name="Category" value="$$createCategory$$"/>
57+
</actionGroup>
58+
<actionGroup ref="expandAdminProductSection" stepKey="expandAdminProductSection"/>
59+
<seeElementInDOM selector="{{CategoryContentSection.descriptionTextArea}}" stepKey="seeDescriptionAreaInDOM"/>
60+
<dontSeeElementInDOM selector="{{PageBuilderProductAttribute.PageBuilderBtn('description')}}" stepKey="dontSeePageBuilderButton"/>
61+
</test>
2662
</tests>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,13 @@
7676
<actionGroup ref="logout" stepKey="logout"/>
7777
</after>
7878
<seeElement selector="{{PageBuilderProductAttribute.PageBuilderBtn('description')}}" stepKey="seePageBuilderButton"/>
79+
<dontSeeElementInDOM selector="{{AdminProductContentSection.descriptionTextArea}}" stepKey="dontSeeDescriptionAreaInDOM"/>
7980
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
8081
<actionGroup ref="navigateToCreatedProductEditPage" stepKey="navigateToCreatedProductEditPage">
8182
<argument name="product" value="$$createProduct$$"/>
8283
</actionGroup>
8384
<actionGroup ref="expandAdminProductSection" stepKey="expandAdminProductSection"/>
85+
<seeElementInDOM selector="{{AdminProductContentSection.descriptionTextArea}}" stepKey="seeDescriptionAreaInDOM"/>
8486
<dontSeeElementInDOM selector="{{PageBuilderProductAttribute.PageBuilderBtn('description')}}" stepKey="dontSeePageBuilderButton"/>
8587
</test>
8688
</tests>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@
147147
<seeElement selector="{{ButtonItemOnStage.buttonItemText('1', PageBuilderButtonItemText_Common.value)}}" stepKey="seeButtonTextStage"/>
148148
<!-- Save Page -->
149149
<comment userInput="Save Page" stepKey="commentSavePage"/>
150-
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
151-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
150+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
151+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
152152
<!-- Validate Stage After Save -->
153153
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
154154
<seeElement selector="{{ButtonItemOnStage.buttonItemText('1', PageBuilderButtonItemText_Common.value)}}" stepKey="seeButtonTextStageAfterSave"/>

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

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,23 @@
610610
<argument name="section" value="SlideOnConfigurationPanel"/>
611611
</actionGroup>
612612
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel1Settings2"/>
613+
<actionGroup ref="addChildContentTypeFromOptionMenu" stepKey="addChildContentType2">
614+
<argument name="contentType" value="PageBuilderSliderContentType"/>
615+
</actionGroup>
616+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanelAfterAdd2">
617+
<argument name="section" value="SlideOnBackend"/>
618+
<argument name="targetIndex" value="3"/>
619+
</actionGroup>
620+
<!-- Edit Slide 3 -->
621+
<comment userInput="Edit Slide 3" stepKey="commentEditSlide3"/>
622+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterSlideNameText3">
623+
<argument name="property" value="PageBuilderSlideItemSlideName_Slide3"/>
624+
</actionGroup>
625+
<actionGroup ref="addTextToTinyMCE" stepKey="addTextToTinyMCESlide3">
626+
<argument name="property" value="PageBuilderSlideItemContent_Slide3"/>
627+
<argument name="section" value="SlideOnConfigurationPanel"/>
628+
</actionGroup>
629+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel1Settings3"/>
613630
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
614631
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage1"/>
615632
<!-- Validate Stage -->
@@ -629,16 +646,16 @@
629646
<comment userInput="xCoordinateToMoveTo: $xCoordinateToMoveTo" stepKey="commentXCoordinate"/>
630647
<executeJS function="return document.querySelectorAll('{{SliderOnStage.slideNavigationDragHandle}}')[0].clientHeight / 2" stepKey="yCoordinateToMoveTo"/>
631648
<comment userInput="yCoordinateToMoveTo: $yCoordinateToMoveTo" stepKey="commentYCoordinate"/>
632-
<click selector="{{SliderOnStage.slideNavigationDot('1', '2')}}" stepKey="clickSlideDot"/>
649+
<click selector="{{SliderOnStage.slideNavigationDot('1', '3')}}" stepKey="clickSlideDot"/>
633650
<waitForPageLoad stepKey="waitForPageLoad2"/>
634-
<dragAndDrop selector1="{{SliderOnStage.slideNavigationDragHandleByIndex('1', '2')}}" selector2="{{SliderOnStage.slideNavigationDot('1', '1')}}" x="$xCoordinateToMoveTo" y="$yCoordinateToMoveTo" stepKey="dragAndDropSlide"/>
651+
<dragAndDrop selector1="{{SliderOnStage.slideNavigationDragHandleByIndex('1', '3')}}" selector2="{{SliderOnStage.slideNavigationDot('1', '1')}}" x="$xCoordinateToMoveTo" y="$yCoordinateToMoveTo" stepKey="dragAndDropSlide"/>
635652
<waitForPageLoad stepKey="waitForDragAndDrop"/>
636653
<!-- Validate Stage After Sorting -->
637654
<comment userInput="Validate Stage After Sorting" stepKey="commentValidateStage2"/>
638-
<seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide2.value)}}" stepKey="seeSlide1ContentAfterSort"/>
655+
<seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide3.value)}}" stepKey="seeSlide1ContentAfterSort"/>
639656
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusNavigationAfterSort"/>
640657
<moveMouseOver selector="{{SliderOnStage.activeSlideNavigationDot}}" stepKey="mouseOverActiveSlide2AfterSort"/>
641-
<see userInput="{{PageBuilderSlideItemSlideName_Slide2.value}}" selector="{{SliderOnStage.slideNavigationDotNameTooltip('1')}}" stepKey="seeSlideName2InTooltipAfterSort"/>
658+
<see userInput="{{PageBuilderSlideItemSlideName_Slide3.value}}" selector="{{SliderOnStage.slideNavigationDotNameTooltip('1')}}" stepKey="seeSlideName3InTooltipAfterSort"/>
642659
<moveMouseOver selector="{{SliderOnStage.slideNavigationDot('1', '2')}}" stepKey="moveMouseOverSecondSlideNavigationDot"/>
643660
<see userInput="{{PageBuilderSlideItemSlideName_Slide1.value}}" selector="{{SliderOnStage.slideNavigationDotNameTooltip('1')}}" stepKey="seeSlideName1InTooltipAfterSort"/>
644661
<click selector="{{SliderOnStage.slideNavigationDot('1', '2')}}" stepKey="clickSecondNavigationDotAfterSort"/>
@@ -648,10 +665,10 @@
648665
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
649666
<!-- Validate Stage After Saving -->
650667
<comment userInput="Validate Stage After Saving" stepKey="commentValidateStage3"/>
651-
<seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide2.value)}}" stepKey="seeSlide2ContentAfterSave2"/>
668+
<seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide3.value)}}" stepKey="seeSlide3ContentAfterSave2"/>
652669
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusNavigationAfterSave2"/>
653670
<moveMouseOver selector="{{SliderOnStage.activeSlideNavigationDot}}" stepKey="mouseOverActiveSlide2AfterSave"/>
654-
<see userInput="{{PageBuilderSlideItemSlideName_Slide2.value}}" selector="{{SliderOnStage.slideNavigationDotNameTooltip('1')}}" stepKey="seeSlideName2InTooltipAfterSave2"/>
671+
<see userInput="{{PageBuilderSlideItemSlideName_Slide3.value}}" selector="{{SliderOnStage.slideNavigationDotNameTooltip('1')}}" stepKey="seeSlideName3InTooltipAfterSave2"/>
655672
<moveMouseOver selector="{{SliderOnStage.slideNavigationDot('1', '2')}}" stepKey="moveMouseOverSecondSlideNavigationDotAfterSave2"/>
656673
<see userInput="{{PageBuilderSlideItemSlideName_Slide1.value}}" selector="{{SliderOnStage.slideNavigationDotNameTooltip('1')}}" stepKey="seeSlideName1InTooltipAfterSave2"/>
657674
<click selector="{{SliderOnStage.slideNavigationDot('1', '2')}}" stepKey="clickSecondNavigationDot2"/>
@@ -663,7 +680,7 @@
663680
<argument name="contentType" value="PageBuilderSliderContentType"/>
664681
</actionGroup>
665682
<waitForElementVisible selector="{{SlideOnFrontend.slickSlideIndex('0')}}" stepKey="waitForSlide1"/>
666-
<see userInput="{{PageBuilderSlideItemContent_Slide2.value}}" selector="{{SlideOnFrontend.slickSlideIndex('0')}}" stepKey="seeSlide1ContentDisplayed"/>
683+
<see userInput="{{PageBuilderSlideItemContent_Slide3.value}}" selector="{{SlideOnFrontend.slickSlideIndex('0')}}" stepKey="seeSlide1ContentDisplayed"/>
667684
<click selector="{{SliderOnFrontend.slideNavigationDot('1', '2')}}" stepKey="clickNextSlideOnSlider"/>
668685
<waitForPageLoad stepKey="waitForPageLoad5"/>
669686
<waitForElementVisible selector="{{SlideOnFrontend.slickSlideIndex('1')}}" stepKey="waitForSlide2"/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,6 +1363,9 @@
13631363
<actionGroup ref="addChildContentTypeFromOptionMenu" stepKey="addChildContentType2">
13641364
<argument name="contentType" value="PageBuilderTabsContentType"/>
13651365
</actionGroup>
1366+
<actionGroup ref="addChildContentTypeFromOptionMenu" stepKey="addChildContentType3">
1367+
<argument name="contentType" value="PageBuilderTabsContentType"/>
1368+
</actionGroup>
13661369
<see selector="{{TabOnStage.tabHeader('1')}}" userInput="{{PageBuilderTabName1Default.value}}" stepKey="seeTab1NameStage"/>
13671370
<see selector="{{TabOnStage.tabHeader('2')}}" userInput="{{PageBuilderTabName2Default.value}}" stepKey="seeTab2NameStage"/>
13681371
<actionGroup ref="moveTabItem" stepKey="moveTabItem">

0 commit comments

Comments
 (0)