Skip to content

Commit 7563c8c

Browse files
dhaeckerdhaecker
committed
MC-3475: Create MFTF Tests
- Skipping failing tests in mainline - Fixing CR feedback for same width buttons
1 parent a06b03e commit 7563c8c

File tree

4 files changed

+30
-15
lines changed

4 files changed

+30
-15
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,9 @@
364364
<testCaseId value="MAGETWO-89332"/>
365365
<group value="pagebuilder"/>
366366
<group value="pagebuilder-advancedConfig"/>
367+
<skip>
368+
<issueId value="MC-3720"/>
369+
</skip>
367370
</annotations>
368371
<before>
369372
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

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

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2253,6 +2253,8 @@
22532253
<group value="pagebuilder"/>
22542254
<group value="pagebuilder-buttons"/>
22552255
<group value="pagebuilder-buttonGroup"/>
2256+
<group value="pagebuilder-column"/>
2257+
<group value="pagebuilder-columnResize"/>
22562258
</annotations>
22572259
<before>
22582260
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -2364,8 +2366,9 @@
23642366
<executeJS function="return parseInt(window.getComputedStyle(document.querySelector('{{ColumnOnBackend.columnX('1')}}')).width)" stepKey="column1Width1"/>
23652367
<executeJS function="return parseInt(window.getComputedStyle(document.querySelector('{{ColumnOnBackend.columnX('2')}}')).width)" stepKey="column2Width1"/>
23662368
<executeJS function="return Math.round({$column1Width1}/{$column2Width1})" stepKey="columnSizeRatio"/>
2369+
<executeJS function="return {{PageBuilderGridSize.defaultGridSize}}-1" stepKey="expectedColumnSizeRatio"/>
23672370
<assertEquals stepKey="assertColumnIsLarge">
2368-
<expectedResult type="string">11</expectedResult>
2371+
<expectedResult type="variable">$expectedColumnSizeRatio</expectedResult>
23692372
<actualResult type="variable">$columnSizeRatio</actualResult>
23702373
</assertEquals>
23712374
<!-- Validate Stage: Large Column -->
@@ -2408,20 +2411,17 @@
24082411
<actualResult type="variable">$buttonWidthStorefrontMobile</actualResult>
24092412
</assertLessThan>
24102413
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop2"/>
2411-
<!-- Resize Column: Small -->
2412-
<comment userInput="Resize Column: Small" stepKey="commentResize2"/>
2414+
<!-- Move Buttons to Small Column -->
2415+
<comment userInput="Move Buttons to Small Column" stepKey="moveButtons"/>
24132416
<switchToPreviousTab stepKey="switchToPreviousTab2"/>
24142417
<reloadPage stepKey="reloadPage3"/>
24152418
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
2416-
<executeJS function="return document.querySelector('{{ColumnOnBackend.columnResizeGridLine('1')}}').clientWidth" stepKey="guideWidth2"/>
2417-
<dragAndDrop selector1="{{ColumnOnBackend.columnX('1')}} {{ColumnOnBackend.columnResizeHandle}}" selector2="{{ColumnOnBackend.columnResizeGridLine('1')}}" x="$guideWidth2" stepKey="dragColumn2"/>
2418-
<executeJS function="return parseInt(window.getComputedStyle(document.querySelector('{{ColumnOnBackend.columnX('1')}}')).width)" stepKey="column1Width2"/>
2419-
<executeJS function="return parseInt(window.getComputedStyle(document.querySelector('{{ColumnOnBackend.columnX('2')}}')).width)" stepKey="column2Width2"/>
2420-
<executeJS function="return Math.round({$column2Width2}/{$column1Width2})" stepKey="columnSizeRatio2"/>
2421-
<assertEquals stepKey="assertColumnIsSmall">
2422-
<expectedResult type="string">11</expectedResult>
2423-
<actualResult type="variable">$columnSizeRatio2</actualResult>
2424-
</assertEquals>
2419+
<actionGroup ref="moveContentTypeToContainer" stepKey="moveButtonsToRightColumn">
2420+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
2421+
<argument name="contentTypeIndex" value="1"/>
2422+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
2423+
<argument name="containerTargetIndex" value="2"/>
2424+
</actionGroup>
24252425
<!-- Validate Stage: Small Column -->
24262426
<comment userInput="Validate Stage: Small Column" stepKey="commentValidateStage3"/>
24272427
<actionGroup ref="validateButtonItemsSameSize" stepKey="validateButtonsSameSizeStage3">
@@ -2430,7 +2430,7 @@
24302430
</actionGroup>
24312431
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStage.jsButtonSelector('1')}}).width)" stepKey="buttonWidth3"/>
24322432
<assertLessThan stepKey="assertButtonSmallerThanColumn3">
2433-
<expectedResult type="variable">$column1Width2</expectedResult>
2433+
<expectedResult type="variable">$column2Width1</expectedResult>
24342434
<actualResult type="variable">$buttonWidth3</actualResult>
24352435
</assertLessThan>
24362436
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage3"/>
@@ -2442,7 +2442,7 @@
24422442
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
24432443
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
24442444
</actionGroup>
2445-
<executeJS function="return parseInt(window.getComputedStyle(document.querySelector('{{ColumnOnFrontend.columnX('1')}}')).width)" stepKey="columnWidthStorefront3"/>
2445+
<executeJS function="return parseInt(window.getComputedStyle(document.querySelector('{{ColumnOnFrontend.columnX('2')}}')).width)" stepKey="columnWidthStorefront3"/>
24462446
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefront3"/>
24472447
<assertLessThan stepKey="assertButtonSmallerThanColumnStorefront3">
24482448
<expectedResult type="variable">$columnWidthStorefront3</expectedResult>
@@ -2455,7 +2455,7 @@
24552455
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
24562456
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
24572457
</actionGroup>
2458-
<executeJS function="return parseInt(window.getComputedStyle(document.querySelector('{{ColumnOnFrontend.columnX('1')}}')).width)" stepKey="columnWidthStorefrontMobile3"/>
2458+
<executeJS function="return parseInt(window.getComputedStyle(document.querySelector('{{ColumnOnFrontend.columnX('2')}}')).width)" stepKey="columnWidthStorefrontMobile3"/>
24592459
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefrontMobile3"/>
24602460
<assertLessThan stepKey="assertButtonSmallerThanColumnStorefrontMobile3">
24612461
<expectedResult type="variable">$columnWidthStorefrontMobile</expectedResult>
@@ -2475,6 +2475,8 @@
24752475
<group value="pagebuilder"/>
24762476
<group value="pagebuilder-buttons"/>
24772477
<group value="pagebuilder-buttonGroup"/>
2478+
<group value="pagebuilder-column"/>
2479+
<group value="pagebuilder-columnResize"/>
24782480
</annotations>
24792481
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="fillButtonType1">
24802482
<argument name="property" value="PageBuilderButtonItemType_Secondary"/>
@@ -2492,6 +2494,8 @@
24922494
<group value="pagebuilder"/>
24932495
<group value="pagebuilder-buttons"/>
24942496
<group value="pagebuilder-buttonGroup"/>
2497+
<group value="pagebuilder-column"/>
2498+
<group value="pagebuilder-columnResize"/>
24952499
</annotations>
24962500
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="fillButtonType1">
24972501
<argument name="property" value="PageBuilderButtonItemType_Link"/>
@@ -2509,6 +2513,8 @@
25092513
<group value="pagebuilder"/>
25102514
<group value="pagebuilder-buttons"/>
25112515
<group value="pagebuilder-buttonGroup"/>
2516+
<group value="pagebuilder-tabs"/>
2517+
<group value="pagebuilder-tabs-content"/>
25122518
</annotations>
25132519
<before>
25142520
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,9 @@
270270
<group value="pagebuilder"/>
271271
<group value="pagebuilder-row"/>
272272
<group value="pagebuilder-rowLayout"/>
273+
<skip>
274+
<issueId value="MC-3720"/>
275+
</skip>
273276
</annotations>
274277
<before>
275278
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,9 @@
190190
<testCaseId value="MC-3465"/>
191191
<group value="pagebuilder"/>
192192
<group value="pagebuilder-text"/>
193+
<skip>
194+
<issueId value="MC-3720"/>
195+
</skip>
193196
</annotations>
194197
<before>
195198
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />

0 commit comments

Comments
 (0)