Skip to content

Commit dcf9ab3

Browse files
hannahnidahannahnida
committed
#609: Content Type Toolbar hidden under PageBuilder header in Full screen - Added new steps in mftf tests
1 parent 42aa2af commit dcf9ab3

File tree

2 files changed

+63
-0
lines changed

2 files changed

+63
-0
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingLiveEditToolbarNotCutOffInFullScreenModeTest.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,5 +115,29 @@
115115
<!-- Check bottom of toolbar is above top of input box -->
116116
<comment userInput="Check bottom of toolbar is above top of input box" stepKey="commentCheckToolbarAboveInputBoxAfterExitFullScreen"/>
117117
<comment userInput="assertToolbarAboveInputBoxAfterExitFullScreen" stepKey="assertToolbarAboveInputBoxAfterExitFullScreen"/>
118+
<!-- Resize column to 3/12 ratio -->
119+
<comment userInput="Change Column To 3:12 Ratio" stepKey="ChangeColumnToDifferentRatio"/>
120+
<executeJS function="return document.querySelector('{{ColumnOnBackend.columnResizeGridLine('3')}}').clientWidth" stepKey="guideWidth"/>
121+
<dragAndDrop selector1="{{ColumnOnBackend.columnX('1')}} {{ColumnOnBackend.columnResizeHandle}}" selector2="{{ColumnOnBackend.columnResizeGridLine('3')}}" x="$guideWidth" stepKey="dragColumnOneToThree"/>
122+
<seeElement selector="{{ColumnOnBackend.displayLabel('1','3/12')}}" stepKey="validateColumnWidth"/>
123+
<!-- Focus on Heading Content Type -->
124+
<actionGroup ref="clickInsideLiveEditHeading" stepKey="focusOnHeadingContentType">
125+
<argument name="index" value="1"/>
126+
</actionGroup>
127+
<executeJS function="{{HeadingOnStage.headingToolbarViewportPositionTop('0')}}" stepKey="toolbarTopPositionInMediumColumn"/>
128+
<executeJS function="{{HeadingOnStage.headingContentTypeViewportPositionBottom('0')}}" stepKey="inputBoxBottomPositionInMediumColumn"/>
129+
<executeJS function="{{HeadingOnStage.headingContentTypeViewportPositionTop('0')}}" stepKey="inputBoxTopPositionInMediumColumn"/>
130+
<comment userInput="Assert toolbar did not overflow" stepKey="commentAssertToolbarNotOverflowInMediumColumn"/>
131+
<!-- Assert toolbar did not overflow in 3/12 column -->
132+
<assertGreaterThanOrEqual stepKey="assertToolbarTopBoundingClientRectIsNotNegativeInMediumColumn">
133+
<expectedResult type="int">0</expectedResult>
134+
<actualResult type="variable">$inputBoxTopPositionInMediumColumn</actualResult>
135+
</assertGreaterThanOrEqual>
136+
<!-- Check top of toolbar is below bottom of input box in 3/12 column -->
137+
<comment userInput="Check top of toolbar is below bottom of input box in 3/12 column" stepKey="commentCheckToolbarBelowInputBoxInMediumColumn"/>
138+
<assertGreaterThanOrEqual stepKey="assertToolbarAboveInputBoxInMediumColumn">
139+
<expectedResult type="variable">$inputBoxBottomPositionInMediumColumn</expectedResult>
140+
<actualResult type="variable">$toolbarTopPositionInMediumColumn</actualResult>
141+
</assertGreaterThanOrEqual>
118142
</test>
119143
</tests>

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,5 +114,44 @@
114114
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage2"/>
115115
<waitForPageLoad stepKey="waitForPageLoad3"/>
116116
<seeElement selector="{{TextOnStorefront.textInImportantStyle(PageBuilderTextProperty.value)}}" stepKey="seeTextInImportantStyleOnStorefront"/>
117+
<!-- Remove HTML Code Content Type -->
118+
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateBackToCreatedCMSPage">
119+
<argument name="CMSPage" value="$$createCMSPage$$"/>
120+
</actionGroup>
121+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage3"/>
122+
<actionGroup ref="removeContentTypeFromStageByIndex" stepKey="removeHTMLCodeContentType">
123+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
124+
<argument name="contentTypeNumber" value="1"/>
125+
</actionGroup>
126+
<actionGroup ref="confirmRemovalModal" stepKey="confirmHTMLCodeRemoval"/>
127+
<actionGroup ref="removeContentTypeFromStageByIndex" stepKey="removeTextContentType">
128+
<argument name="contentType" value="PageBuilderTextContentType"/>
129+
<argument name="contentTypeNumber" value="1"/>
130+
</actionGroup>
131+
<actionGroup ref="confirmRemovalModal" stepKey="confirmTextRemoval"/>
132+
<!-- Verify TinyMCE4 toolbar in 11/12 column -->
133+
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
134+
<argument name="contentType" value="PageBuilderColumnContentType"/>
135+
</actionGroup>
136+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection2">
137+
<argument name="contentType" value="PageBuilderTextContentType"/>
138+
</actionGroup>
139+
<comment userInput="Change Columns To 11:12 Ratio" stepKey="ChangeColumnToDifferentRatio"/>
140+
<executeJS function="return document.querySelector('{{ColumnOnBackend.columnResizeGridLine('11')}}').clientWidth" stepKey="guideWidth"/>
141+
<dragAndDrop selector1="{{ColumnOnBackend.columnX('1')}} {{ColumnOnBackend.columnResizeHandle}}" selector2="{{ColumnOnBackend.columnResizeGridLine('11')}}" x="$guideWidth" stepKey="dragColumnOneToEleven"/>
142+
<waitForPageLoad stepKey="waitForDragAndDrop"/>
143+
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextContentTypeIntoColumn">
144+
<argument name="contentType" value="PageBuilderTextContentType"/>
145+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
146+
</actionGroup>
147+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusAgainOnEditorArea"/>
148+
<actionGroup ref="VerifyTinyMCEActionGroup" stepKey="verifyTinyMCE4InColumnContentType"/>
149+
<actionGroup ref="VerifyMagentoEntityActionGroup" stepKey="verifyMagentoEntitiesInColumnContentType"/>
150+
<seeElement selector="{{WYSIWYGOnPageBuilderInline.undo}}" stepKey="seeUndoInColumnContentType"/>
151+
<seeElement selector="{{WYSIWYGOnPageBuilderInline.redo}}" stepKey="seeRedoInColumnContentType"/>
152+
<seeElement selector="{{WYSIWYGOnPageBuilderInline.fontSize}}" stepKey="seeFontsizeInColumnContentType"/>
153+
<seeElement selector="{{WYSIWYGOnPageBuilderInline.lineHeight}}" stepKey="seeLineHeightInColumnContentType"/>
154+
<seeElement selector="{{WYSIWYGOnPageBuilderInline.textColor}}" stepKey="seeTextColorInColumnContentType"/>
155+
<seeElement selector="{{WYSIWYGOnPageBuilderInline.backgroundColor}}" stepKey="seeBackgroundColorInColumnContentType"/>
117156
</test>
118157
</tests>

0 commit comments

Comments
 (0)