Skip to content

Commit 91f2dfa

Browse files
committed
MAGETWO-91377: Create MFTF Tests
- addressing code review comments
1 parent e5cbd73 commit 91f2dfa

File tree

2 files changed

+6
-19
lines changed

2 files changed

+6
-19
lines changed

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -787,19 +787,6 @@
787787
<actualResult type="variable">expectedContentBlockHeightWithPadding</actualResult>
788788
</assertEquals>
789789
</actionGroup>
790-
<actionGroup name="validateContentBlockHeightOnStageFromInteger">
791-
<arguments>
792-
<argument name="contentBlock"/>
793-
<argument name="index" defaultValue="1" type="string"/>
794-
<argument name="expectedHeight" defaultValue="1" type="string"/>
795-
</arguments>
796-
<executeJS function="{{PageBuilderActionsSection.computedHeightOnStage(contentBlock.role,index)}}" stepKey="actualStageContentBlockHeight"/>
797-
<executeJS function="return Math.round({{expectedHeight}})" stepKey="expectedContentBlockHeight"/>
798-
<assertEquals stepKey="assertHeightOnStageMatchesExpected">
799-
<expectedResult type="variable">actualStageContentBlockHeight</expectedResult>
800-
<actualResult type="variable">expectedContentBlockHeight</actualResult>
801-
</assertEquals>
802-
</actionGroup>
803790
<actionGroup name="validateContentBlockHeightOnStageWithoutPadding">
804791
<arguments>
805792
<argument name="contentBlock"/>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@
107107
<argument name="containerTargetIndex" value="1"/>
108108
</actionGroup>
109109
<comment userInput="Validate Column Height does not shrink to Tabs Height" stepKey="commentValidateColumnHeightWithTabs"/>
110-
<executeJS function="{{PageBuilderActionsSection.computedHeightOnStage(PageBuilderTabsContentBlock.role,'1')}}" stepKey="actualStageTabsHeight"/>
111110
<executeJS function="{{PageBuilderActionsSection.computedHeightOnStage(PageBuilderColumnContentBlock.role,'1')}}" stepKey="actualStageColumnHeightWithTabs"/>
112111
<assertEquals stepKey="assertColumnHeightDoesNotAdjustToTabsHeight">
113112
<expectedResult type="variable">actualStageInitialColumnHeight</expectedResult>
@@ -152,11 +151,12 @@
152151
</actionGroup>
153152
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
154153
<comment userInput="Validate Column Height On Stage With Custom Min Height Matches Expected" stepKey="commentValidateColumnHeight"/>
155-
<actionGroup ref="validateContentBlockHeightOnStageFromInteger" stepKey="assertInitialColumnHeightMatchesExpected">
156-
<argument name="contentBlock" value="PageBuilderColumnContentBlock"/>
157-
<argument name="index" value="1"/>
158-
<argument name="expectedHeight" value="210"/>
159-
</actionGroup>
154+
<executeJS function="{{PageBuilderActionsSection.computedHeightOnStage(PageBuilderColumnContentBlock.role,'1')}}" stepKey="actualStageContentBlockHeight"/>
155+
<executeJS function="return Math.round({{PageBuilderAppearanceMinHeightProperty_200.value}} + {{PageBuilderAdvancedMarginsAndPaddingProperty.paddingTop}} + {{PageBuilderAdvancedMarginsAndPaddingProperty.paddingBottom}})" stepKey="expectedColumnHeight"/>
156+
<assertEquals stepKey="assertHeightOnStageMatchesExpected">
157+
<expectedResult type="variable">actualStageContentBlockHeight</expectedResult>
158+
<actualResult type="variable">expectedColumnHeight</actualResult>
159+
</assertEquals>
160160
<executeJS function="{{PageBuilderActionsSection.computedHeightOnStage(PageBuilderColumnContentBlock.role,'1')}}" stepKey="actualStageInitialColumnHeight"/>
161161
<comment userInput="Validate Row Height adjusts to Column Height" stepKey="commentValidateRowHeightAdjustToColumn"/>
162162
<executeJS function="{{PageBuilderActionsSection.computedHeightOnStage(PageBuilderRowContentBlock.role,'1')}}" stepKey="actualStageRowHeightWithColumns"/>

0 commit comments

Comments
 (0)