Skip to content

Commit 75a77d9

Browse files
committed
MC-3508: Variable value on storefront is not wrapped in side Column container
- update slider to use container action group - remove unnecessary waitForElementVisible - remove unnecessary comment and reorder
1 parent eaed556 commit 75a77d9

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2143,7 +2143,6 @@
21432143
<!-- Add Variable to Banner -->
21442144
<comment userInput="Add Variable to Banner" stepKey="commentAddVariableToBanner"/>
21452145
<click selector="{{PageBuilderStage.inlineWYSIWYGEditor(PageBuilderBannerContentType.role, '1')}}" stepKey="focusOnEditorArea"/>
2146-
<waitForElementVisible selector="{{PageBuilderStage.inlineWYSIWYGEditorPanel(PageBuilderBannerContentType.role, '1')}}" stepKey="waitForEditorPanel"/>
21472146
<actionGroup ref="addVariableToTinyMCE" stepKey="addVariableToTinyMCE">
21482147
<argument name="variable" value="TinyMCEVariableStoreName"/>
21492148
</actionGroup>
@@ -2159,11 +2158,10 @@
21592158
<comment userInput="Resize Columns" stepKey="commentResizeColumns"/>
21602159
<executeJS function="return document.querySelector('{{ColumnOnBackend.columnResizeGridLine('1')}}').clientWidth" stepKey="guideWidth"/>
21612160
<dragAndDrop selector1="{{ColumnOnBackend.columnX('1')}} {{ColumnOnBackend.columnResizeHandle}}" selector2="{{ColumnOnBackend.columnResizeGridLine('1')}}" x="$guideWidth" stepKey="resizeColumnToOne"/>
2162-
<!-- Validate Height of Variable in Storefront -->
2163-
<comment userInput="Validate Height of Variable in Storefront" stepKey="commentValidateStorefront"/>
21642161
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
21652162
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
2166-
<comment userInput="View Text inside column on storefront" stepKey="viewTextOnStorefront"/>
2163+
<!-- Validate Height of Variable in Storefront -->
2164+
<comment userInput="Validate Height of Variable in Storefront" stepKey="commentValidateStorefront"/>
21672165
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
21682166
<argument name="contentType" value="PageBuilderBannerContentType"/>
21692167
</actionGroup>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1510,14 +1510,15 @@
15101510
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupElements">
15111511
<argument name="group" value="PageBuilderSliderContentType"/>
15121512
</actionGroup>
1513-
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragContentTypeToStage">
1513+
<actionGroup ref="dragContentTypeToContainerAndExpectEditPanel" stepKey="dragSliderToColumn">
15141514
<argument name="contentType" value="PageBuilderSliderContentType"/>
1515+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
1516+
<argument name="containerTargetIndex" value="1"/>
15151517
</actionGroup>
15161518
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
15171519
<!-- Add Variable to Slide -->
15181520
<comment userInput="Add Variable to Slide" stepKey="commentAddVariableToSlide"/>
15191521
<click selector="{{PageBuilderStage.inlineWYSIWYGEditor(PageBuilderSlideContentType.role, '1')}}" stepKey="focusOnEditorArea"/>
1520-
<waitForElementVisible selector="{{PageBuilderStage.inlineWYSIWYGEditorPanel(PageBuilderSlideContentType.role, '1')}}" stepKey="waitForEditorPanel"/>
15211522
<actionGroup ref="addVariableToTinyMCE" stepKey="addVariableToTinyMCE">
15221523
<argument name="variable" value="TinyMCEVariableStoreName"/>
15231524
</actionGroup>
@@ -1535,11 +1536,10 @@
15351536
<comment userInput="Resize Columns" stepKey="commentResizeColumns"/>
15361537
<executeJS function="return document.querySelector('{{ColumnOnBackend.columnResizeGridLine('1')}}').clientWidth" stepKey="guideWidth"/>
15371538
<dragAndDrop selector1="{{ColumnOnBackend.columnX('1')}} {{ColumnOnBackend.columnResizeHandle}}" selector2="{{ColumnOnBackend.columnResizeGridLine('1')}}" x="$guideWidth" stepKey="resizeColumnToOne"/>
1538-
<!-- Validate Height of Variable in Storefront -->
1539-
<comment userInput="Validate Height of Variable in Storefront" stepKey="commentValidateStorefront"/>
15401539
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
15411540
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
1542-
<comment userInput="View Text inside column on storefront" stepKey="viewTextOnStorefront"/>
1541+
<!-- Validate Height of Variable in Storefront -->
1542+
<comment userInput="Validate Height of Variable in Storefront" stepKey="commentValidateStorefront"/>
15431543
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
15441544
<argument name="contentType" value="PageBuilderSliderContentType"/>
15451545
</actionGroup>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2346,11 +2346,10 @@
23462346
<comment userInput="Resize Columns" stepKey="commentResizeColumns"/>
23472347
<executeJS function="return document.querySelector('{{ColumnOnBackend.columnResizeGridLine('1')}}').clientWidth" stepKey="guideWidth"/>
23482348
<dragAndDrop selector1="{{ColumnOnBackend.columnX('1')}} {{ColumnOnBackend.columnResizeHandle}}" selector2="{{ColumnOnBackend.columnResizeGridLine('1')}}" x="$guideWidth" stepKey="resizeColumnToOne"/>
2349-
<!-- Validate height of variable in storefront -->
2350-
<comment userInput="Validate height of variable in storefront" stepKey="commentValidateStorefront"/>
23512349
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
23522350
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
2353-
<comment userInput="View Text inside column on storefront" stepKey="viewTextOnStorefront"/>
2351+
<!-- Validate height of variable in storefront -->
2352+
<comment userInput="Validate height of variable in storefront" stepKey="commentValidateStorefront"/>
23542353
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
23552354
<argument name="contentType" value="PageBuilderTextContentType"/>
23562355
</actionGroup>

0 commit comments

Comments
 (0)