Skip to content

Commit 42b876e

Browse files
cspruiellcspruiell
committed
MC-4305: Duplicating Column that Contains Image Content Type Breaks Stage
 - update tests
1 parent 8a9106f commit 42b876e

File tree

1 file changed

+51
-13
lines changed

1 file changed

+51
-13
lines changed

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

Lines changed: 51 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,6 +1128,13 @@
11281128
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
11291129
</before>
11301130
<after>
1131+
<actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
1132+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
1133+
<argument name="FolderName" value="{{PageBuilderImageProperty_StageJPG.path}}"/>
1134+
</actionGroup>
1135+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
1136+
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
1137+
</actionGroup>
11311138
<actionGroup ref="logout" stepKey="logout"/>
11321139
</after>
11331140
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -1193,6 +1200,13 @@
11931200
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
11941201
</before>
11951202
<after>
1203+
<actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
1204+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
1205+
<argument name="FolderName" value="{{PageBuilderImageProperty_StageJPG.path}}"/>
1206+
</actionGroup>
1207+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
1208+
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
1209+
</actionGroup>
11961210
<actionGroup ref="logout" stepKey="logout"/>
11971211
</after>
11981212
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -1203,7 +1217,7 @@
12031217
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
12041218
<argument name="contentType" value="PageBuilderColumnContentType"/>
12051219
</actionGroup>
1206-
<!-- Add Image to Stage -->
1220+
<!-- Add Image to Column -->
12071221
<comment userInput="Add Image to Column" stepKey="commentAddImageToColumn"/>
12081222
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
12091223
<argument name="group" value="PageBuilderImageContentType"/>
@@ -1221,6 +1235,7 @@
12211235
<argument name="contentType" value="PageBuilderColumnContentType"/>
12221236
<argument name="contentTypeXCoordinate" value="5"/>
12231237
<argument name="contentTypeYCoordinate" value="5"/>
1238+
<argument name="expectedIndex" value="3"/>
12241239
</actionGroup>
12251240
<!-- Validate content type is duplicated -->
12261241
<comment userInput="Validate content type is duplicated" stepKey="commentValidateDuplicateOnStage"/>
@@ -1264,6 +1279,13 @@
12641279
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
12651280
</before>
12661281
<after>
1282+
<actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
1283+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
1284+
<argument name="FolderName" value="{{PageBuilderImageProperty_StageJPG.path}}"/>
1285+
</actionGroup>
1286+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
1287+
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
1288+
</actionGroup>
12671289
<actionGroup ref="logout" stepKey="logout"/>
12681290
</after>
12691291
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -1274,7 +1296,7 @@
12741296
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
12751297
<argument name="contentType" value="PageBuilderTabsContentType"/>
12761298
</actionGroup>
1277-
<!-- Add Image to Stage -->
1299+
<!-- Add Image to Tab -->
12781300
<comment userInput="Add Image to Tab" stepKey="commentAddImageToTab"/>
12791301
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
12801302
<argument name="group" value="PageBuilderImageContentType"/>
@@ -1292,7 +1314,7 @@
12921314
<argument name="section" value="TabOnStage"/>
12931315
<argument name="targetIndex" value="1"/>
12941316
</actionGroup>
1295-
<click selector="{{TabsOnStage.tabsContainer}}" stepKey="unfocusTabsOptions"/>
1317+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusTabOptions"/>
12961318
<!-- Validate Tab Item is duplicated -->
12971319
<comment userInput="Validate Tab Item is duplicated" stepKey="commentValidateTabItemDuplicateOnStage"/>
12981320
<seeElement selector="{{ImageOnStage.base('2')}}" stepKey="seeImage2"/>
@@ -1309,22 +1331,31 @@
13091331
<seeElement selector="{{TabsOnStage.base('2')}}" stepKey="seeTabGroup1"/>
13101332
<seeElement selector="{{TabOnStage.base('3')}}" stepKey="seeTab3"/>
13111333
<seeElement selector="{{ImageOnStage.base('3')}}" stepKey="seeImage3"/>
1312-
<seeElementInDOM selector="{{TabOnStage.base('4')}}" stepKey="seeTab4"/>
1313-
<seeElementInDOM selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4"/>
1334+
<click selector="{{TabOnStage.tabHeader('4')}}" stepKey="switchToTab4Stage"/>
1335+
<waitForPageLoad stepKey="waitForPageLoad"/>
1336+
<seeElement selector="{{TabOnStage.base('4')}}" stepKey="seeTab4"/>
1337+
<seeElement selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4"/>
13141338
<!-- Stage: Validate After Save -->
13151339
<comment userInput="Stage: Validate After Save" stepKey="CommentValidateOnStageAfterSave"/>
13161340
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
13171341
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
13181342
<seeElement selector="{{TabsOnStage.base('1')}}" stepKey="seeTabGroup1AfterSave"/>
13191343
<seeElement selector="{{TabOnStage.base('1')}}" stepKey="seeTab1AfterSave"/>
13201344
<seeElement selector="{{ImageOnStage.base('1')}}" stepKey="seeImage1AfterSave"/>
1321-
<seeElementInDOM selector="{{TabOnStage.base('2')}}" stepKey="seeTab2AfterSave"/>
1322-
<seeElementInDOM selector="{{ImageOnStage.base('2')}}" stepKey="seeImage2AfterSave"/>
1345+
<actionGroup ref="switchTabs" stepKey="switchToTab2StageAfterSave">
1346+
<argument name="section" value="TabOnStage"/>
1347+
<argument name="from" value="1"/>
1348+
<argument name="to" value="2"/>
1349+
</actionGroup>
1350+
<seeElement selector="{{TabOnStage.base('2')}}" stepKey="seeTab2AfterSave"/>
1351+
<seeElement selector="{{ImageOnStage.base('2')}}" stepKey="seeImage2AfterSave"/>
13231352
<seeElement selector="{{TabsOnStage.base('2')}}" stepKey="seeTabGroup2AfterSave"/>
13241353
<seeElement selector="{{TabOnStage.base('3')}}" stepKey="seeTab3AfterSave"/>
13251354
<seeElement selector="{{ImageOnStage.base('3')}}" stepKey="seeImage3AfterSave"/>
1326-
<seeElementInDOM selector="{{TabOnStage.base('4')}}" stepKey="seeTab4AfterSave"/>
1327-
<seeElementInDOM selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4AfterSave"/>
1355+
<click selector="{{TabOnStage.tabHeader('4')}}" stepKey="switchToTab4StageAfterSave"/>
1356+
<waitForPageLoad stepKey="waitForPageLoad2"/>
1357+
<seeElement selector="{{TabOnStage.base('4')}}" stepKey="seeTab4AfterSave"/>
1358+
<seeElement selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4AfterSave"/>
13281359
<!-- Validate content type is duplicated in Storefront -->
13291360
<comment userInput="Validate content type is duplicated in Storefront" stepKey="commentValidateDuplicatedStorefront"/>
13301361
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
@@ -1333,12 +1364,19 @@
13331364
<seeElement selector="{{TabsOnFrontend.base('1')}}" stepKey="seeTabGroup1Storefront"/>
13341365
<seeElement selector="{{TabOnStorefront.base('1')}}" stepKey="seeTab1Storefront"/>
13351366
<seeElement selector="{{ImageOnStorefront.base('1')}}" stepKey="seeImage1Storefront"/>
1336-
<seeElementInDOM selector="{{TabOnStorefront.base('2')}}" stepKey="seeTab2Storefront"/>
1337-
<seeElementInDOM selector="{{ImageOnStorefront.base('2')}}" stepKey="seeImage2Storefront"/>
1367+
<actionGroup ref="switchTabs" stepKey="switchToTab2Storefront">
1368+
<argument name="section" value="TabOnStorefront"/>
1369+
<argument name="from" value="1"/>
1370+
<argument name="to" value="2"/>
1371+
</actionGroup>
1372+
<seeElement selector="{{TabOnStorefront.base('2')}}" stepKey="seeTab2Storefront"/>
1373+
<seeElement selector="{{ImageOnStorefront.base('2')}}" stepKey="seeImage2Storefront"/>
13381374
<seeElement selector="{{TabsOnFrontend.base('2')}}" stepKey="seeTabGroup2Storefront"/>
13391375
<seeElement selector="{{TabOnStorefront.base('3')}}" stepKey="seeTab3Storefront"/>
13401376
<seeElement selector="{{ImageOnStorefront.base('3')}}" stepKey="seeImage3Storefront"/>
1341-
<seeElementInDOM selector="{{TabOnStorefront.base('4')}}" stepKey="seeTab4Storefront"/>
1342-
<seeElementInDOM selector="{{ImageOnStorefront.base('4')}}" stepKey="seeImage4Storefront"/>
1377+
<click selector="{{TabOnStorefront.tabHeader('4')}}" stepKey="switchToTab4Storefront"/>
1378+
<waitForPageLoad stepKey="waitForPageLoad3"/>
1379+
<seeElement selector="{{TabOnStorefront.base('4')}}" stepKey="seeTab4Storefront"/>
1380+
<seeElement selector="{{ImageOnStorefront.base('4')}}" stepKey="seeImage4Storefront"/>
13431381
</test>
13441382
</tests>

0 commit comments

Comments
 (0)