Skip to content

Commit 64635c1

Browse files
committed
MC-3330: Add Missing P0-P1 MFTF Tests For PageBuilder On Catalog Category
- Fixing pagebuilder category tests - Addressing CR feedback - Improving old tests to follow standards
1 parent a29582d commit 64635c1

9 files changed

+291
-336
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
<argument name="section"/>
4949
</arguments>
5050
<scrollTo selector="{{section.base('index')}}" stepKey="waitForButtonElementStorefront"/>
51-
<seeElement selector="{{PageBuilderLinkAttributeStoreFront.ExternalURLLink(CMSPage.identifier)}}" stepKey="seePageLinkOnStoreFront"/>
52-
<click selector="{{PageBuilderLinkAttributeStoreFront.ExternalURLLink(CMSPage.identifier)}}" stepKey="clickLink"/>
51+
<seeElement selector="{{PageBuilderLinkAttributeStoreFront.ExternalURLContainsLink(CMSPage.identifier)}}" stepKey="seePageLinkOnStoreFront"/>
52+
<click selector="{{PageBuilderLinkAttributeStoreFront.ExternalURLContainsLink(CMSPage.identifier)}}" stepKey="clickLink"/>
5353
<waitForPageLoad stepKey="waitForPageLoad"/>
5454
<see userInput="{{CMSPage.title}}" stepKey="seePageName"/>
5555
</actionGroup>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
</section>
1818
<section name="PageBuilderLinkAttributeStoreFront">
1919
<element name="ExternalURLLink" type="text" selector="//a[@href='{{var1}}']" parameterized="true"/>
20+
<element name="ExternalURLContainsLink" type="text" selector="//a[contains(@href,'{{var1}}')]" parameterized="true"/>
2021
<element name="ExternalURLInCurrentTab" type="text" selector="//a[@href='{{var1}}' and @target='']" parameterized="true"/>
2122
<element name="ExternalURLInNewTab" type="text" selector="//a[@href='{{var1}}' and @target='_blank']" parameterized="true"/>
2223
</section>

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
<before>
2424
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
2525
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
26-
<createData entity="_defaultBlock" stepKey="createPreReqBlock" />
26+
<createData entity="_defaultBlock" stepKey="createPreReqBlock"/>
2727
</before>
2828
<after>
2929
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
30-
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
30+
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock"/>
3131
<actionGroup ref="logout" stepKey="logout"/>
3232
</after>
3333
<!--Create CMS Block using PageBuilder-->
@@ -43,11 +43,9 @@
4343
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
4444
<argument name="contentType" value="PageBuilderTextContentType"/>
4545
</actionGroup>
46-
<waitForLoadingMaskToDisappear stepKey="waitForEditPanelSpinner"/>
4746
<fillField selector="{{TextOnConfiguration.textArea}}" userInput="Hello CMS Block from PageBuilder" stepKey="addTextToEditor"/>
4847
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
49-
<click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="clickSaveBlock"/>
50-
<see userInput="You saved the block." stepKey="seeSuccessMessage"/>
48+
<actionGroup ref="saveCMSBlock" stepKey="saveCMSBlock"/>
5149
<actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToContentCreatedCMSBlockPage2">
5250
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
5351
</actionGroup>
@@ -801,7 +799,7 @@
801799
<createData entity="_emptyCmsBlock" stepKey="createPreReqBlock" after="loginAsAdmin"/>
802800
<createData entity="_emptyCmsPage" stepKey="createCMSPage" after="createPreReqBlock"/>
803801
<actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToAPageWithPageBuilder">
804-
<argument name="CMSBlockPage" value="$$createPreReqBlock$$" />
802+
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
805803
</actionGroup>
806804
<comment userInput="---merging to remove step---" stepKey="switchToPageBuilderStage"/>
807805
</before>
@@ -827,7 +825,7 @@
827825
<createData entity="_emptyCmsBlock" stepKey="createPreReqBlock" after="loginAsAdmin"/>
828826
<createData entity="_emptyCmsPage" stepKey="createCMSPage" after="createPreReqBlock"/>
829827
<actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToAPageWithPageBuilder">
830-
<argument name="CMSBlockPage" value="$$createPreReqBlock$$" />
828+
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
831829
</actionGroup>
832830
<comment userInput="---merging to remove step---" stepKey="switchToPageBuilderStage"/>
833831
</before>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@
2323
<before>
2424
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
2525
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
26-
<createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage" />
26+
<createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
2727
</before>
2828
<after>
2929
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
30-
<deleteData createDataKey="createPreReqCMSPage" stepKey="deletePreReqCMSPage" />
30+
<deleteData createDataKey="createPreReqCMSPage" stepKey="deletePreReqCMSPage"/>
3131
<actionGroup ref="logout" stepKey="logout"/>
3232
</after>
3333
<!--Create CMS Page using PageBuilder-->
3434
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToContentCreatedCMSPage1">
3535
<argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
3636
</actionGroup>
37-
<waitForElementVisible selector="{{PageBuilderPanel.layoutMenuSection}}" stepKey="waitForPageBuilderDisplay" />
37+
<waitForElementVisible selector="{{PageBuilderPanel.layoutMenuSection}}" stepKey="waitForPageBuilderDisplay"/>
3838
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
3939
<argument name="contentType" value="PageBuilderTextContentType"/>
4040
</actionGroup>
@@ -47,7 +47,7 @@
4747
<waitForLoadingMaskToDisappear stepKey="waitForEditPanelSpinner"/>
4848
<fillField selector="{{TextOnConfiguration.textArea}}" userInput="Hello CMS Page from PageBuilder" stepKey="addTextToEditor"/>
4949
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
50-
<click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="saveCMSWithPageBuilderContent" />
50+
<click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="saveCMSWithPageBuilderContent"/>
5151
<!--Enable WYSIWYG-->
5252
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
5353
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToContentCreatedCMSPage2">
@@ -65,10 +65,10 @@
6565
<group value="pagebuilder-cms-page"/>
6666
</annotations>
6767
<!-- PageBuilder is enabled so check default is full width -->
68-
<comment userInput="PageBuilder is enabled so check default is full width" stepKey="commentSeeFullWidth" />
69-
<seeOptionIsSelected selector="{{DefaultLayoutsSection.pageLayout}}" userInput="{{PageBuilderFullWidthLayout.cms}}" stepKey="seeOneColumnSelected" />
70-
<seeOptionIsSelected selector="{{DefaultLayoutsSection.productLayout}}" userInput="{{PageBuilderFullWidthLayout.product}}" stepKey="seeNoLayoutUpdatesSelected1" />
71-
<seeOptionIsSelected selector="{{DefaultLayoutsSection.categoryLayout}}" userInput="{{PageBuilderFullWidthLayout.category}}" stepKey="seeNoLayoutUpdatesSelected2" />
68+
<comment userInput="PageBuilder is enabled so check default is full width" stepKey="commentSeeFullWidth"/>
69+
<seeOptionIsSelected selector="{{DefaultLayoutsSection.pageLayout}}" userInput="{{PageBuilderFullWidthLayout.cms}}" stepKey="seeOneColumnSelected"/>
70+
<seeOptionIsSelected selector="{{DefaultLayoutsSection.productLayout}}" userInput="{{PageBuilderFullWidthLayout.product}}" stepKey="seeNoLayoutUpdatesSelected1"/>
71+
<seeOptionIsSelected selector="{{DefaultLayoutsSection.categoryLayout}}" userInput="{{PageBuilderFullWidthLayout.category}}" stepKey="seeNoLayoutUpdatesSelected2"/>
7272
</test>
7373
<test name="PageBuilderCMSPageCreateCMSPageFullWidthLayout">
7474
<annotations>

0 commit comments

Comments
 (0)