Skip to content

Commit 2db7f4e

Browse files
dhaeckerdhaecker
committed
MC-13769: Add Missing P0-P1 MFTF Tests For PageBuilder On CMS Block - Render Content Through Block
 - Fixing broken tests - Moving text in block test
1 parent b7f78f5 commit 2db7f4e

File tree

3 files changed

+88
-87
lines changed

3 files changed

+88
-87
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<waitForElementVisible selector="{{BlockOnGrid.addSelectedBtn}}" stepKey="waitForAddSelected"/>
2727
<click selector="{{BlockOnGrid.addSelectedBtn}}" stepKey="clickAddSelected"/>
2828
<waitForPageLoad stepKey="waitForPageLoad4"/>
29-
<waitForElementVisible selector="{{BlockOnForm.title(block.name)}}" stepKey="waitToSeeBlockTitle"/>
29+
<waitForElementVisible selector="{{BlockOnForm.title(block.title)}}" stepKey="waitToSeeBlockTitle"/>
3030
</actionGroup>
3131
<actionGroup name="verifyBlockOnStage">
3232
<arguments>

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

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

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="TextHeightConsistencyBetweenContentTypeAndBlockOnStorefront">
12+
<annotations>
13+
<features value="PageBuilder"/>
14+
<stories value="Text"/>
15+
<title value="Height consistency of text in PageBuilder storefront"/>
16+
<description value="Verify text height consistent whether in text content type or text content type inside block"/>
17+
<severity value="AVERAGE"/>
18+
<useCaseId value="MC-4254"/>
19+
<testCaseId value="MC-13792"/>
20+
<group value="pagebuilder"/>
21+
<group value="pagebuilder-text"/>
22+
<group value="pagebuilder-block"/>
23+
<group value="pagebuilder-block-content"/>
24+
</annotations>
25+
<before>
26+
<createData entity="_defaultBlock" stepKey="createPreReqBlock" />
27+
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
28+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
29+
</before>
30+
<after>
31+
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
32+
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
33+
<actionGroup ref="logout" stepKey="logout"/>
34+
</after>
35+
<actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCmsBlock">
36+
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
37+
</actionGroup>
38+
<!-- Update block with text -->
39+
<comment userInput="Update block with text" stepKey="commentUpdateBlockWithText"/>
40+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionForText1">
41+
<argument name="contentType" value="PageBuilderTextContentType"/>
42+
</actionGroup>
43+
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoBlockStage">
44+
<argument name="contentType" value="PageBuilderTextContentType"/>
45+
</actionGroup>
46+
<actionGroup ref="inlineEditWYSIWYGFromStage" stepKey="inlineEditBlockText">
47+
<argument name="contentType" value="PageBuilderTextContentType"/>
48+
<argument name="content" value="{{PageBuilderTextProperty.value}}"/>
49+
</actionGroup>
50+
<click selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="saveBlock"/>
51+
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCmsPage">
52+
<argument name="CMSPage" value="$$createCMSPage$$"/>
53+
</actionGroup>
54+
<!-- Add text to page -->
55+
<comment userInput="Add text to page" stepKey="addTextToPage"/>
56+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionForText2">
57+
<argument name="contentType" value="PageBuilderTextContentType"/>
58+
</actionGroup>
59+
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoPageStage">
60+
<argument name="contentType" value="PageBuilderTextContentType"/>
61+
</actionGroup>
62+
<actionGroup ref="inlineEditWYSIWYGFromStage" stepKey="inlineEdit">
63+
<argument name="contentType" value="PageBuilderTextContentType"/>
64+
<argument name="content" value="{{PageBuilderTextProperty.value}}"/>
65+
</actionGroup>
66+
<!-- Add block to page -->
67+
<comment userInput="Add block to page" stepKey="addBlockToPage"/>
68+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionForBlock">
69+
<argument name="contentType" value="PageBuilderBlockContentType"/>
70+
</actionGroup>
71+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockOntoStage">
72+
<argument name="contentType" value="PageBuilderBlockContentType"/>
73+
</actionGroup>
74+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
75+
<argument name="contentType" value="PageBuilderBlockContentType"/>
76+
</actionGroup>
77+
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
78+
<argument name="block" value="$$createPreReqBlock$$"/>
79+
</actionGroup>
80+
<waitForElementVisible selector="{{BlockOnForm.title('$$createPreReqBlock.title$$')}}" stepKey="waitToSeeBlockTitle"/>
81+
<seeElement selector="{{BlockOnForm.title('$$createPreReqBlock.title$$')}}" stepKey="seeBlockTitleOnForm"/>
82+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
83+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
84+
<!--Get storefront information-->
85+
<comment userInput="Get storefront information" stepKey="commentGetStorefrontInformation"/>
86+
<actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToStoreFront">
87+
<argument name="page" value="$$createCMSPage.identifier$$"/>
88+
</actionGroup>
89+
<waitForPageLoad stepKey="waitForStorefront"/>
90+
<waitForElement selector="{{TextOnStorefront.base('1')}}" stepKey="waitForTextOnStorefront"/>
91+
<executeJS function="return document.evaluate(&quot;{{TextOnStorefront.base('1'))}}&quot;, document.body).iterateNext().offsetHeight;" stepKey="getTextOnStorefrontHeight"/>
92+
<executeJS function="return document.evaluate(&quot;{{BlockOnStorefront.text('1', '1'))}}&quot;, document.body).iterateNext().offsetHeight;" stepKey="getBlockTextOnStorefrontHeight"/>
93+
<assertEquals stepKey="assertStageAndStorefrontHeightAreClose">
94+
<expectedResult type="variable">getTextOnStorefrontHeight</expectedResult>
95+
<actualResult type="variable">getBlockTextOnStorefrontHeight</actualResult>
96+
</assertEquals>
97+
</test>
1198
<test name="BlockRenderTextThroughBlockContentTypeTinyMCE4WysiwygEnabledByDefault">
1299
<annotations>
13100
<features value="PageBuilder"/>

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

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -2690,92 +2690,6 @@
26902690
<actualResult type="variable">getStageAndStorefrontHeightDifference</actualResult>
26912691
</assertLessThanOrEqual>
26922692
</test>
2693-
<test name="TextHeightConsistencyBetweenContentTypeAndBlockOnStorefront">
2694-
<annotations>
2695-
<features value="PageBuilder"/>
2696-
<stories value="Text"/>
2697-
<title value="Height consistency of text in PageBuilder storefront"/>
2698-
<description value="Verify text height consistent whether in text content type or text content type inside block"/>
2699-
<severity value="AVERAGE"/>
2700-
<useCaseId value="MC-4254"/>
2701-
<testCaseId value="MC-13792"/>
2702-
<group value="pagebuilder"/>
2703-
<group value="pagebuilder-text"/>
2704-
<group value="pagebuilder-block"/>
2705-
</annotations>
2706-
<before>
2707-
<createData entity="_defaultBlock" stepKey="createPreReqBlock" />
2708-
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
2709-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2710-
</before>
2711-
<after>
2712-
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
2713-
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
2714-
<actionGroup ref="logout" stepKey="logout"/>
2715-
</after>
2716-
<actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCmsBlock">
2717-
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
2718-
</actionGroup>
2719-
<!-- Update block with text -->
2720-
<comment userInput="Update block with text" stepKey="commentUpdateBlockWithText"/>
2721-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionForText1">
2722-
<argument name="contentType" value="PageBuilderTextContentType"/>
2723-
</actionGroup>
2724-
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoBlockStage">
2725-
<argument name="contentType" value="PageBuilderTextContentType"/>
2726-
</actionGroup>
2727-
<actionGroup ref="inlineEditWYSIWYGFromStage" stepKey="inlineEditBlockText">
2728-
<argument name="contentType" value="PageBuilderTextContentType"/>
2729-
<argument name="content" value="{{PageBuilderTextProperty.value}}"/>
2730-
</actionGroup>
2731-
<click selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="saveBlock"/>
2732-
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCmsPage">
2733-
<argument name="CMSPage" value="$$createCMSPage$$"/>
2734-
</actionGroup>
2735-
<!-- Add text to page -->
2736-
<comment userInput="Add text to page" stepKey="addTextToPage"/>
2737-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionForText2">
2738-
<argument name="contentType" value="PageBuilderTextContentType"/>
2739-
</actionGroup>
2740-
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoPageStage">
2741-
<argument name="contentType" value="PageBuilderTextContentType"/>
2742-
</actionGroup>
2743-
<actionGroup ref="inlineEditWYSIWYGFromStage" stepKey="inlineEdit">
2744-
<argument name="contentType" value="PageBuilderTextContentType"/>
2745-
<argument name="content" value="{{PageBuilderTextProperty.value}}"/>
2746-
</actionGroup>
2747-
<!-- Add block to page -->
2748-
<comment userInput="Add block to page" stepKey="addBlockToPage"/>
2749-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionForBlock">
2750-
<argument name="contentType" value="PageBuilderBlockContentType"/>
2751-
</actionGroup>
2752-
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockOntoStage">
2753-
<argument name="contentType" value="PageBuilderBlockContentType"/>
2754-
</actionGroup>
2755-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
2756-
<argument name="contentType" value="PageBuilderBlockContentType"/>
2757-
</actionGroup>
2758-
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
2759-
<argument name="block" value="$$createPreReqBlock$$"/>
2760-
</actionGroup>
2761-
<waitForElementVisible selector="{{BlockOnForm.title('$$createPreReqBlock.title$$')}}" stepKey="waitToSeeBlockTitle"/>
2762-
<seeElement selector="{{BlockOnForm.title('$$createPreReqBlock.title$$')}}" stepKey="seeBlockTitleOnForm"/>
2763-
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
2764-
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
2765-
<!--Get storefront information-->
2766-
<comment userInput="Get storefront information" stepKey="commentGetStorefrontInformation"/>
2767-
<actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToStoreFront">
2768-
<argument name="page" value="$$createCMSPage.identifier$$"/>
2769-
</actionGroup>
2770-
<waitForPageLoad stepKey="waitForStorefront"/>
2771-
<waitForElement selector="{{TextOnStorefront.base('1')}}" stepKey="waitForTextOnStorefront"/>
2772-
<executeJS function="return document.evaluate(&quot;{{TextOnStorefront.base('1'))}}&quot;, document.body).iterateNext().offsetHeight;" stepKey="getTextOnStorefrontHeight"/>
2773-
<executeJS function="return document.evaluate(&quot;{{BlockOnStorefront.text('1', '1'))}}&quot;, document.body).iterateNext().offsetHeight;" stepKey="getBlockTextOnStorefrontHeight"/>
2774-
<assertEquals stepKey="assertStageAndStorefrontHeightAreClose">
2775-
<expectedResult type="variable">getTextOnStorefrontHeight</expectedResult>
2776-
<actualResult type="variable">getBlockTextOnStorefrontHeight</actualResult>
2777-
</assertEquals>
2778-
</test>
27792693
<test name="TextTooltipMenusAreNotCutOffInFullScreenMode" extends="HeadingLiveEditToolbarNotCutOffInFullScreenMode">
27802694
<annotations>
27812695
<features value="PageBuilder"/>

0 commit comments

Comments
 (0)