Skip to content

Commit fe20035

Browse files
committed
Merge remote-tracking branch 'origin/MC-4294' into cms-team-1-delivery
# Conflicts: # app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slider/preview.js # app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slider/preview.ts
2 parents 9e10421 + 2e54bc0 commit fe20035

File tree

7 files changed

+258
-12
lines changed

7 files changed

+258
-12
lines changed

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -612,6 +612,12 @@
612612
<argument name="property" value="PageBuilderBackgroundColor_Hex_Grey"/>
613613
</actionGroup>
614614
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
615+
<actionGroup ref="duplicateSmallContentType" stepKey="duplicateSmallContentType">
616+
<argument name="section" value="SlideOnBackend"/>
617+
<argument name="targetIndex" value="1"/>
618+
</actionGroup>
619+
<seeElement selector="{{SlideOnBackend.backgroundColor('2', PageBuilderBackgroundColor_Hex_Grey.rgb)}}" stepKey="seeBackgroundColorForSlideItem2OnStageBeforeMoving"/>
620+
<dontSeeElement selector="{{SlideOnBackend.backgroundColor('1', PageBuilderBackgroundColor_Hex_Grey.rgb)}}" stepKey="dontSeeBackgroundColorForSlideItem1OnStageBeforeMoving"/>
615621
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusSlide"/>
616622
<!-- Validate Stage -->
617623
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
@@ -649,6 +655,20 @@
649655
<argument name="contentTypeIndex" value="1"/>
650656
<argument name="containerTargetIndex" value="1"/>
651657
</actionGroup>
658+
<seeElement selector="{{SlideOnBackend.backgroundColor('2', PageBuilderBackgroundColor_Hex_Grey.rgb)}}" stepKey="seeBackgroundColorForSlideItem2OnStageAfterMoving"/>
659+
<dontSeeElement selector="{{SlideOnBackend.backgroundColor('1', PageBuilderBackgroundColor_Hex_Grey.rgb)}}" stepKey="dontSeeBackgroundColorForSlideItem1OnStageAfterMoving"/>
660+
<!-- Change appearance of row and re-evaluate -->
661+
<comment userInput="Change appearance of row and re-evaluate" stepKey="commentChangeAppearanceOfRowAndReevaluate"/>
662+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocus2"/>
663+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStageForFirstRow">
664+
<argument name="contentType" value="PageBuilderRowContentType"/>
665+
</actionGroup>
666+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceRow1">
667+
<argument name="property" value="PageBuilderRowAppearance_FullWidth"/>
668+
</actionGroup>
669+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsRow1"/>
670+
<seeElement selector="{{SlideOnBackend.backgroundColor('2', PageBuilderBackgroundColor_Hex_Grey.rgb)}}" stepKey="seeBackgroundColorForSlideItem2OnStageAfterChangingRowAppearance"/>
671+
<dontSeeElement selector="{{SlideOnBackend.backgroundColor('1', PageBuilderBackgroundColor_Hex_Grey.rgb)}}" stepKey="dontSeeBackgroundColorForSlideItem1OnStageAfterChangingRowAppearance"/>
652672
<!-- Save Page -->
653673
<comment userInput="Save Page" stepKey="commentSavePage"/>
654674
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
@@ -669,6 +689,8 @@
669689
<argument name="contentTypeIndex" value="1"/>
670690
<argument name="containerTargetIndex" value="1"/>
671691
</actionGroup>
692+
<seeElement selector="{{SliderOnFrontend.slideNavigationDot('1', '1')}}" stepKey="seeSlideItem1NavigationDotOnStorefront"/>
693+
<seeElement selector="{{SliderOnFrontend.slideNavigationDot('1', '2')}}" stepKey="seeSlideItem2NavigationDotOnStorefront"/>
672694
</test>
673695
<test name="SliderValidateShowHideOnSliderDefaultState">
674696
<annotations>

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

Lines changed: 192 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1158,7 +1158,7 @@
11581158
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading">
11591159
<argument name="index" value="1"/>
11601160
</actionGroup>
1161-
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnTypeToStage">
1161+
<actionGroup ref="dragContentTypeToStage" stepKey="dragTabsContentTypeToStage">
11621162
<argument name="contentType" value="PageBuilderTabsContentType"/>
11631163
</actionGroup>
11641164
<click selector="{{TabsOnStage.tabsContainer}}" stepKey="focusTabsElement"/>
@@ -1172,4 +1172,195 @@
11721172
<argument name="containerTargetIndex" value="1" />
11731173
</actionGroup>
11741174
</test>
1175+
<test name="TabsMovesTabs">
1176+
<annotations>
1177+
<features value="PageBuilder"/>
1178+
<stories value="Tabs"/>
1179+
<title value="Tab Group - Validate Proper Rendering and Interactivity After Moving To Different Container"/>
1180+
<description value="Validate that tabs renders itself properly and retains its interactivity after moving to a different parent container."/>
1181+
<severity value="CRITICAL"/>
1182+
<useCaseId value="MC-4294"/>
1183+
<testCaseId value="MC-4994"/>
1184+
<group value="pagebuilder"/>
1185+
<group value="pagebuilder-tab"/>
1186+
<group value="pagebuilder-tabGroup"/>
1187+
</annotations>
1188+
<before>
1189+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1190+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1191+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1192+
</before>
1193+
<after>
1194+
<actionGroup ref="logout" stepKey="logout"/>
1195+
</after>
1196+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1197+
<argument name="contentType" value="PageBuilderTabsContentType"/>
1198+
</actionGroup>
1199+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1200+
<argument name="group" value="PageBuilderTabsContentType"/>
1201+
</actionGroup>
1202+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowContentTypeToStage">
1203+
<argument name="contentType" value="PageBuilderRowContentType"/>
1204+
</actionGroup>
1205+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTabsContentTypeToSecondRow">
1206+
<argument name="contentType" value="PageBuilderTabsContentType"/>
1207+
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
1208+
<argument name="containerTargetIndex" value="2"/>
1209+
</actionGroup>
1210+
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="validateTabsInsideSecondRowOnStage">
1211+
<argument name="contentType" value="PageBuilderTabsContentType"/>
1212+
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
1213+
<argument name="positionInContainer" value="1"/>
1214+
<argument name="contentTypeIndex" value="1"/>
1215+
<argument name="containerTargetIndex" value="2"/>
1216+
</actionGroup>
1217+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragColumnContentTypeToFirstRowContentTypeOnStage">
1218+
<argument name="contentType" value="PageBuilderColumnContentType"/>
1219+
<argument name="contentTypeIndex" value="1"/>
1220+
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
1221+
<argument name="containerTargetIndex" value="1"/>
1222+
</actionGroup>
1223+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocus"/>
1224+
<actionGroup ref="moveContentTypeToContainer" stepKey="moveTabsIntoFirstColumn">
1225+
<argument name="contentType" value="PageBuilderTabsContentType"/>
1226+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
1227+
<argument name="containerTargetIndex" value="1"/>
1228+
</actionGroup>
1229+
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="validateTabsInsideFirstColumnOnStage">
1230+
<argument name="contentType" value="PageBuilderTabsContentType"/>
1231+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
1232+
<argument name="positionInContainer" value="1"/>
1233+
<argument name="contentTypeIndex" value="1"/>
1234+
<argument name="containerTargetIndex" value="1"/>
1235+
</actionGroup>
1236+
<seeElement selector="{{TabOnStage.tabHeaderItemActive('1')}}" stepKey="seeFirstTabAsActive"/>
1237+
<actionGroup ref="duplicateSmallContentType" stepKey="duplicateSmallContentType">
1238+
<argument name="section" value="TabOnStage"/>
1239+
<argument name="targetIndex" value="1"/>
1240+
</actionGroup>
1241+
<seeElement selector="{{TabOnStage.tabHeaderItemActive('2')}}" stepKey="seeSecondTabAsActiveAfterDuplicating"/>
1242+
<!-- Change appearance of row and re-evaluate -->
1243+
<comment userInput="Change appearance of row and re-evaluate" stepKey="commentChangeAppearanceOfRowAndReevaluate"/>
1244+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocus2"/>
1245+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStageForFirstRow">
1246+
<argument name="contentType" value="PageBuilderRowContentType"/>
1247+
<argument name="contentTypeIndex" value="1"/>
1248+
<argument name="contentTypeXCoordinate" value="10"/>
1249+
<argument name="contentTypeYCoordinate" value="0"/>
1250+
</actionGroup>
1251+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceRow1">
1252+
<argument name="property" value="PageBuilderRowAppearance_FullWidth"/>
1253+
</actionGroup>
1254+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsRow1"/>
1255+
<seeElement selector="{{TabOnStage.tabHeaderItemActive('2')}}" stepKey="seeSecondTabAsActiveAfterChangingRowAppearance"/>
1256+
<actionGroup ref="switchTabs" stepKey="switchTabsStage">
1257+
<argument name="section" value="TabOnStage"/>
1258+
<argument name="from" value="2"/>
1259+
<argument name="to" value="1"/>
1260+
</actionGroup>
1261+
<actionGroup ref="saveCmsPage" stepKey="saveCmsPage"/>
1262+
<!-- Validate Storefront -->
1263+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1264+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1265+
<argument name="contentType" value="PageBuilderTabsContentType"/>
1266+
</actionGroup>
1267+
<actionGroup ref="validateContentTypeInsideContainerStorefront" stepKey="validateTabsInsideFirstColumnOnStorefront">
1268+
<argument name="contentType" value="PageBuilderTabsContentType"/>
1269+
<argument name="contentTypeIndex" value="1"/>
1270+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
1271+
<argument name="containerTargetIndex" value="1"/>
1272+
</actionGroup>
1273+
<actionGroup ref="switchTabs" stepKey="switchTabsStorefront">
1274+
<argument name="section" value="TabOnStorefront"/>
1275+
<argument name="from" value="1"/>
1276+
<argument name="to" value="2"/>
1277+
</actionGroup>
1278+
</test>
1279+
<test name="TabsRendersAndIsInteractiveAfterDroppingSomeColumnsAbove">
1280+
<annotations>
1281+
<features value="PageBuilder"/>
1282+
<stories value="Tabs"/>
1283+
<title value="Tab Group - Validate Proper Rendering and Interactivity After Dropping Column Content types above it"/>
1284+
<description value="Validate that tabs renders itself properly and retains its interactivity after dropping column content types above it."/>
1285+
<severity value="CRITICAL"/>
1286+
<useCaseId value="MC-4294"/>
1287+
<testCaseId value="MC-5060"/>
1288+
<group value="pagebuilder"/>
1289+
<group value="pagebuilder-tab"/>
1290+
<group value="pagebuilder-tabGroup"/>
1291+
<group value="pagebuilder-column"/>
1292+
</annotations>
1293+
<before>
1294+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1295+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1296+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1297+
</before>
1298+
<after>
1299+
<actionGroup ref="logout" stepKey="logout"/>
1300+
</after>
1301+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1302+
<argument name="contentType" value="PageBuilderTabsContentType"/>
1303+
</actionGroup>
1304+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1305+
<argument name="group" value="PageBuilderTabsContentType"/>
1306+
</actionGroup>
1307+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowContentTypeToStage">
1308+
<argument name="contentType" value="PageBuilderTabsContentType"/>
1309+
</actionGroup>
1310+
<actionGroup ref="dragContentTypeToDropZone" stepKey="dragColumnContentTypeToRowDirectlyAboveTab">
1311+
<argument name="contentType" value="PageBuilderColumnContentType"/>
1312+
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
1313+
<argument name="containerTargetIndex" value="1"/>
1314+
<argument name="offsetYCoordinate" value="0"/>
1315+
</actionGroup>
1316+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragAnotherColumnContentTypeToFirstRowContentTypeOnStage">
1317+
<argument name="contentType" value="PageBuilderColumnContentType"/>
1318+
<argument name="contentTypeIndex" value="1"/>
1319+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
1320+
<argument name="containerTargetIndex" value="1"/>
1321+
</actionGroup>
1322+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocus"/>
1323+
<seeElement selector="{{TabOnStage.tabHeaderItemActive('1')}}" stepKey="seeFirstTabAsActive"/>
1324+
<actionGroup ref="duplicateSmallContentType" stepKey="duplicateSmallContentType">
1325+
<argument name="section" value="TabOnStage"/>
1326+
<argument name="targetIndex" value="1"/>
1327+
</actionGroup>
1328+
<seeElement selector="{{TabOnStage.tabHeaderItemActive('2')}}" stepKey="seeSecondTabAsActiveAfterDuplicating"/>
1329+
<!-- Change appearance of row and re-evaluate -->
1330+
<comment userInput="Change appearance of row and re-evaluate" stepKey="commentChangeAppearanceOfRowAndReevaluate"/>
1331+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocus2"/>
1332+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStageForFirstRow">
1333+
<argument name="contentType" value="PageBuilderRowContentType"/>
1334+
<argument name="contentTypeIndex" value="1"/>
1335+
<argument name="contentTypeXCoordinate" value="10"/>
1336+
<argument name="contentTypeYCoordinate" value="0"/>
1337+
</actionGroup>
1338+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceRow1">
1339+
<argument name="property" value="PageBuilderRowAppearance_FullWidth"/>
1340+
</actionGroup>
1341+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsRow1"/>
1342+
<seeElement selector="{{TabOnStage.tabHeaderItemActive('2')}}" stepKey="seeSecondTabAsActiveAfterChangingRowAppearance"/>
1343+
<actionGroup ref="switchTabs" stepKey="switchTabsStage">
1344+
<argument name="section" value="TabOnStage"/>
1345+
<argument name="from" value="2"/>
1346+
<argument name="to" value="1"/>
1347+
</actionGroup>
1348+
<actionGroup ref="saveCmsPage" stepKey="saveCmsPage"/>
1349+
<!-- Validate Storefront -->
1350+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1351+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1352+
<argument name="contentType" value="PageBuilderTabsContentType"/>
1353+
</actionGroup>
1354+
<actionGroup ref="validateContentTypeInsideContainerStorefront" stepKey="validateTabsInsideFirstColumnOnStorefront">
1355+
<argument name="contentType" value="PageBuilderTabsContentType"/>
1356+
<argument name="contentTypeIndex" value="1"/>
1357+
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
1358+
<argument name="containerTargetIndex" value="1"/>
1359+
</actionGroup>
1360+
<actionGroup ref="switchTabs" stepKey="switchTabsStorefront">
1361+
<argument name="section" value="TabOnStorefront"/>
1362+
<argument name="from" value="1"/>
1363+
<argument name="to" value="2"/>
1364+
</actionGroup>
1365+
</test>
11751366
</tests>

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slider/preview.js

Lines changed: 14 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/tabs/preview.js

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)