Skip to content

Commit 681e2a7

Browse files
committed
#609: Content Type Toolbar hidden under PageBuilder header in Full screen - Changed column resize in mftf tests
1 parent dcf9ab3 commit 681e2a7

File tree

2 files changed

+27
-12
lines changed

2 files changed

+27
-12
lines changed

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

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,25 @@
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"/>
118+
<!-- Remove heading and two of the columns to create 3/12 column -->
119+
<actionGroup ref="removeContentTypeFromStageByIndex" stepKey="removeHeadingContentType">
120+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
121+
<argument name="contentTypeNumber" value="1"/>
122+
</actionGroup>
123+
<actionGroup ref="removeContentTypeFromStageByIndex" stepKey="removeFirstColumnContentType">
124+
<argument name="contentType" value="PageBuilderColumnContentType"/>
125+
<argument name="contentTypeNumber" value="1"/>
126+
</actionGroup>
127+
<actionGroup ref="removeContentTypeFromStageByIndex" stepKey="removeSecondColumnContentType">
128+
<argument name="contentType" value="PageBuilderColumnContentType"/>
129+
<argument name="contentTypeNumber" value="1"/>
130+
</actionGroup>
122131
<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"/>
132+
<!-- Add Another Heading Content Type -->
133+
<comment userInput="Add Heading Content Type" stepKey="commentAddInnerHeadingContentType"/>
134+
<actionGroup ref="dragContentTypeToStage" stepKey="dragHeadingContentTypeIntoColumn">
135+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
136+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
126137
</actionGroup>
127138
<executeJS function="{{HeadingOnStage.headingToolbarViewportPositionTop('0')}}" stepKey="toolbarTopPositionInMediumColumn"/>
128139
<executeJS function="{{HeadingOnStage.headingContentTypeViewportPositionBottom('0')}}" stepKey="inputBoxBottomPositionInMediumColumn"/>

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,17 +129,21 @@
129129
<argument name="contentTypeNumber" value="1"/>
130130
</actionGroup>
131131
<actionGroup ref="confirmRemovalModal" stepKey="confirmTextRemoval"/>
132-
<!-- Verify TinyMCE4 toolbar in 11/12 column -->
132+
<!-- Verify TinyMCE4 toolbar in 9/12 column -->
133133
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
134134
<argument name="contentType" value="PageBuilderColumnContentType"/>
135135
</actionGroup>
136+
<actionGroup ref="duplicateContentType" stepKey="duplicateFirstColumn">
137+
<argument name="contentType" value="PageBuilderColumnContentType"/>
138+
<argument name="targetIndex" value="2"/>
139+
</actionGroup>
140+
<actionGroup ref="removeContentTypeFromStageByIndex" stepKey="removeFirstColumnContentType">
141+
<argument name="contentType" value="PageBuilderColumnContentType"/>
142+
<argument name="contentTypeNumber" value="1"/>
143+
</actionGroup>
136144
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection2">
137145
<argument name="contentType" value="PageBuilderTextContentType"/>
138146
</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"/>
143147
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextContentTypeIntoColumn">
144148
<argument name="contentType" value="PageBuilderTextContentType"/>
145149
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>

0 commit comments

Comments
 (0)