Skip to content

Commit 64d5ad3

Browse files
dhaeckerdhaecker
committed
Merge branch 'MC-3238' into cms-team-1-delivery
2 parents cbb7a73 + 003b736 commit 64d5ad3

File tree

1 file changed

+195
-3
lines changed

1 file changed

+195
-3
lines changed

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

+195-3
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,40 @@
9090
<after>
9191
<actionGroup ref="logout" stepKey="logout"/>
9292
</after>
93-
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
93+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
94+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
95+
</actionGroup>
96+
<!-- Add HTML Code and Save Page -->
97+
<comment userInput="Add HTML and Save Page" stepKey="commentAddHTML"/>
98+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupMedia">
9499
<argument name="group" value="PageBuilderHtmlContentType"/>
95100
</actionGroup>
96-
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
101+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeIntoStage">
97102
<argument name="contentType" value="PageBuilderHtmlContentType"/>
98103
</actionGroup>
99-
<actionGroup ref="removeEmptyContentTypeFromStage" stepKey="removeEmptyContentTypeFromStage">
104+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
105+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
106+
<!-- Delete HTML Code -->
107+
<comment userInput="Delete HTML Code" stepKey="commentDeleteHTMLCode"/>
108+
<actionGroup ref="removeContentTypeFromStage" stepKey="removeContentTypeFromStage">
100109
<argument name="contentType" value="PageBuilderHtmlContentType"/>
101110
</actionGroup>
111+
<!-- Validate Stage -->
112+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
102113
<dontSeeElement selector="{{PageBuilderStage.contentTypeInStage(PageBuilderHtmlContentType.role)}}" stepKey="dontSeeContentTypeInStage"/>
114+
<!-- Save Page -->
115+
<comment userInput="Save Page" stepKey="commentSavePage"/>
116+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
117+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
118+
<!-- Validate Stage After Save -->
119+
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
120+
<dontSeeElementInDOM selector="{{PageBuilderStage.contentTypeInStageByIndex(PageBuilderHtmlContentType.role, '1')}}" stepKey="dontSeeContentTypeInStage2"/>
121+
<!-- Validate Storefront -->
122+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
123+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
124+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
125+
</actionGroup>
126+
<dontSeeElementInDOM selector="{{HtmlOnStorefront.base('1')}}" stepKey="dontSeeContentTypeInStorefront"/>
103127
</test>
104128
<test name="HtmlValidateGeneralDefaultValues">
105129
<annotations>
@@ -354,6 +378,8 @@
354378
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
355379
<!-- Validate Stage -->
356380
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
381+
<seeElement selector="{{HtmlOnStage.base('1')}}" stepKey="seeHtmlBaseStage1"/>
382+
<seeElement selector="{{HtmlOnStage.html('1', PageBuilderHtmlPropertyButton.selector)}}" stepKey="seeHtmlStage1"/>
357383
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage">
358384
<argument name="page" value="HtmlOnStage"/>
359385
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
@@ -400,6 +426,8 @@
400426
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
401427
<!-- Validate Stage After Save -->
402428
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
429+
<seeElement selector="{{HtmlOnStage.base('1')}}" stepKey="seeHtmlBaseStage2"/>
430+
<seeElement selector="{{HtmlOnStage.html('1', PageBuilderHtmlPropertyButton.selector)}}" stepKey="seeHtmlStage2"/>
403431
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage2">
404432
<argument name="page" value="HtmlOnStage"/>
405433
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
@@ -446,6 +474,8 @@
446474
</actionGroup>
447475
<!-- Validate Storefront -->
448476
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
477+
<seeElement selector="{{HtmlOnStorefront.base('1')}}" stepKey="seeHtmlBaseStorefront"/>
478+
<seeElement selector="{{HtmlOnStorefront.html('1', PageBuilderHtmlPropertyButton.selectorOnFrontend)}}" stepKey="seeHtmlStorefront"/>
449479
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStorefront">
450480
<argument name="page" value="HtmlOnStorefront"/>
451481
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
@@ -783,6 +813,49 @@
783813
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
784814
<waitForElementVisible selector="{{HtmlOnStage.empty('1')}}" stepKey="waitForHtmlBaseStage1"/>
785815
</test>
816+
<test name="HTMLEmpty">
817+
<annotations>
818+
<features value="PageBuilder"/>
819+
<stories value="HTML Code"/>
820+
<title value="Validate that empty html will not display any space on Storefront"/>
821+
<description value="Validate that empty html will not display any space on Storefront"/>
822+
<severity value="MAJOR"/>
823+
<useCaseId value="MC-3238"/>
824+
<testCaseId value="MC-5816"/>
825+
<group value="pagebuilder"/>
826+
<group value="pagebuilder-html"/>
827+
</annotations>
828+
<before>
829+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
830+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
831+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
832+
</before>
833+
<after>
834+
<actionGroup ref="logout" stepKey="logout"/>
835+
</after>
836+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
837+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
838+
</actionGroup>
839+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
840+
<argument name="group" value="PageBuilderHtmlContentType"/>
841+
</actionGroup>
842+
<actionGroup ref="dragContentTypeToStage" stepKey="dragToStage">
843+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
844+
</actionGroup>
845+
<seeElementInDOM selector="{{HtmlOnStage.empty('1')}}" stepKey="waitForHtmlBaseStage1"/>
846+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
847+
<!--Validate Stage after saving CMS Page-->
848+
<comment userInput="Validate Stage after saving CMS Page" stepKey="commentValidateStage"/>
849+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
850+
<waitForElementVisible selector="{{HtmlOnStage.empty('1')}}" stepKey="waitForHtmlBaseStage2"/>
851+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
852+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
853+
</actionGroup>
854+
<!-- Validate Storefront -->
855+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
856+
<dontSeeElement selector="{{HtmlOnStorefront.base('1')}}" stepKey="dontSeeHtmlContentVisible"/>
857+
<seeElementInDOM selector="{{HtmlOnStorefront.base('1')}}" stepKey="seeHtmlContentInDOM"/>
858+
</test>
786859
<test name="HTMLCannotAddToStage">
787860
<annotations>
788861
<features value="PageBuilder"/>
@@ -1010,4 +1083,123 @@
10101083
<dontSeeElementInDOM selector="{{HtmlOnStorefront.hidden('1')}}" stepKey="dontSeeHiddenElement"/>
10111084
<seeElement selector="{{HtmlOnStorefront.base('1')}}" stepKey="waitForContentTypeVisible" />
10121085
</test>
1086+
<test name="HtmlMove">
1087+
<annotations>
1088+
<features value="PageBuilder"/>
1089+
<stories value="HTML Code"/>
1090+
<title value="Move Html Between Columns"/>
1091+
<description value="Verify that moving a html content type on the stage will update the storefront"/>
1092+
<severity value="CRITICAL"/>
1093+
<useCaseId value="MC-3238"/>
1094+
<testCaseId value="MC-5814"/>
1095+
<group value="pagebuilder"/>
1096+
<group value="pagebuilder-html"/>
1097+
<group value="pagebuilder-column"/>
1098+
</annotations>
1099+
<before>
1100+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1101+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1102+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1103+
</before>
1104+
<after>
1105+
<actionGroup ref="logout" stepKey="logout"/>
1106+
</after>
1107+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1108+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
1109+
</actionGroup>
1110+
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
1111+
<argument name="contentType" value="PageBuilderColumnContentType"/>
1112+
</actionGroup>
1113+
<!-- Add Heading to Stage -->
1114+
<comment userInput="Add Heading to Stage" stepKey="commentAddHeadingToStage"/>
1115+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1116+
<argument name="group" value="PageBuilderHeadingContentType"/>
1117+
</actionGroup>
1118+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingToColumn">
1119+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
1120+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
1121+
<argument name="containerTargetIndex" value="2" />
1122+
</actionGroup>
1123+
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage">
1124+
<argument name="headingText" value="PageBuilderHeadingTextProperty"/>
1125+
</actionGroup>
1126+
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading">
1127+
<argument name="index" value="1"/>
1128+
</actionGroup>
1129+
<!-- Add Html to Stage -->
1130+
<comment userInput="Add Html to Stage" stepKey="commentAddHtmlToStage"/>
1131+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupMedia">
1132+
<argument name="group" value="PageBuilderHtmlContentType"/>
1133+
</actionGroup>
1134+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHtmlToColumn">
1135+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
1136+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
1137+
<argument name="containerTargetIndex" value="2" />
1138+
</actionGroup>
1139+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
1140+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
1141+
</actionGroup>
1142+
<!-- Update Edit Panel -->
1143+
<comment userInput="Update Edit Panel" stepKey="commentEdit"/>
1144+
<actionGroup ref="fillSlideOutPanelTextArea" stepKey="enterHtmlContent">
1145+
<argument name="property" value="PageBuilderHtmlPropertyButton"/>
1146+
</actionGroup>
1147+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1148+
<!-- Validate Stage -->
1149+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
1150+
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="validateHeadingStage">
1151+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
1152+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
1153+
<argument name="positionInContainer" value="1"/>
1154+
<argument name="contentTypeIndex" value="1"/>
1155+
<argument name="containerTargetIndex" value="2"/>
1156+
</actionGroup>
1157+
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="validateHtmlStage">
1158+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
1159+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
1160+
<argument name="positionInContainer" value="2"/>
1161+
<argument name="contentTypeIndex" value="1"/>
1162+
<argument name="containerTargetIndex" value="2"/>
1163+
</actionGroup>
1164+
<!-- Move Html -->
1165+
<comment userInput="Move Html" stepKey="commentMoveHtml"/>
1166+
<actionGroup ref="moveContentTypeToContainer" stepKey="moveHtmlToLeftColumn">
1167+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
1168+
<argument name="contentTypeIndex" value="1"/>
1169+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
1170+
<argument name="containerTargetIndex" value="1"/>
1171+
</actionGroup>
1172+
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="validateHeadingStage2">
1173+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
1174+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
1175+
<argument name="contentTypeIndex" value="1"/>
1176+
<argument name="containerTargetIndex" value="2"/>
1177+
</actionGroup>
1178+
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="validateHtmlStage2">
1179+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
1180+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
1181+
<argument name="contentTypeIndex" value="1"/>
1182+
<argument name="containerTargetIndex" value="1"/>
1183+
</actionGroup>
1184+
<!-- Save Page -->
1185+
<comment userInput="Save Page" stepKey="commentSavePage"/>
1186+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1187+
<!-- Validate Storefront -->
1188+
<comment userInput="Validate Storefront" stepKey="validateStorefront"/>
1189+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1190+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
1191+
</actionGroup>
1192+
<actionGroup ref="validateContentTypeInsideContainerStorefront" stepKey="validateHeadingStorefront">
1193+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
1194+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
1195+
<argument name="contentTypeIndex" value="1"/>
1196+
<argument name="containerTargetIndex" value="2"/>
1197+
</actionGroup>
1198+
<actionGroup ref="validateContentTypeInsideContainerStorefront" stepKey="validateHtmlStorefront">
1199+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
1200+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
1201+
<argument name="contentTypeIndex" value="1"/>
1202+
<argument name="containerTargetIndex" value="1"/>
1203+
</actionGroup>
1204+
</test>
10131205
</tests>

0 commit comments

Comments
 (0)