Skip to content

Commit 82bf506

Browse files
davemacaulaydavemacaulay
committed
MC-3653: Can Drag & Drop Child Content Types Into Hidden Content Types
- Add tests for dragging existing content types into hidden content type
1 parent 650589b commit 82bf506

File tree

3 files changed

+114
-0
lines changed

3 files changed

+114
-0
lines changed

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,28 @@
151151
<waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
152152
<waitForElementVisible time="30" selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInStage"/>
153153
</actionGroup>
154+
<actionGroup name="cannotMoveContentTypeToContainer">
155+
<arguments>
156+
<argument name="contentType"/>
157+
<argument name="contentTypeIndex" defaultValue="1" type="string"/>
158+
<argument name="containerTargetType"/>
159+
<argument name="containerTargetIndex" defaultValue="1" type="string"/>
160+
<argument name="offsetXCoordinate" defaultValue="10" type="string"/>
161+
<argument name="offsetYCoordinate" defaultValue="0" type="string"/>
162+
<argument name="containerOffsetXCoordinate" defaultValue="null" type="string"/>
163+
<argument name="containerOffsetYCoordinate" defaultValue="null" type="string"/>
164+
<argument name="positionInContainer" defaultValue="1" type="string"/>
165+
</arguments>
166+
<waitForElementVisible time="20" selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInStageVisible"/>
167+
<moveMouseOver selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="onMouseOverContentTypeStage"/>
168+
<waitForPageLoad time="30" stepKey="waitForAnimation"/>
169+
<waitForElementVisible time="10" selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenuByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForOptions"/>
170+
<waitForElementVisible selector="{{PageBuilderContentTypeOptionsMenu.contentTypeMoveByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForEditButton"/>
171+
<dragAndDrop selector1="{{PageBuilderContentTypeOptionsMenu.contentTypeMoveByIndex(contentType.role, contentTypeIndex)}}" selector2="{{PageBuilderStage.contentTypeContainer(containerTargetType.role, containerTargetIndex)}}" x="{{containerOffsetXCoordinate}}" y="{{containerOffsetYCoordinate}}" stepKey="moveContentTypeIntoContainer"/>
172+
<waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
173+
<waitForElementVisible time="30" selector="{{PageBuilderStage.contentTypeInStageByIndex(containerTargetType.role, containerTargetIndex)}}" stepKey="waitForContentTypeStage"/>
174+
<dontSeeElementInDOM selector="{{PageBuilderStage.contentTypeInsideContainerStage(containerTargetType.role, containerTargetIndex, positionInContainer, contentType.role, contentTypeIndex)}}" stepKey="dontSeeContentTypeInContainer"/>
175+
</actionGroup>
154176
<actionGroup name="dragContentTypeNextToExistingContentType">
155177
<arguments>
156178
<argument name="contentType" defaultValue=""/>

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1797,4 +1797,50 @@
17971797
<seeElement selector="{{RowOnStorefront.base('1')}}" stepKey="waitForContentTypeVisible" />
17981798
<seeElement selector="{{HeadingOnStorefront.base('1')}}" stepKey="waitForHeadingVisible" />
17991799
</test>
1800+
<test name="ValidateCannotMoveContentTypeIntoHiddenRow">
1801+
<annotations>
1802+
<features value="PageBuilder"/>
1803+
<stories value="Text"/>
1804+
<title value="Row whilst hidden doesnt receive drop events"/>
1805+
<description value="A user isn't able to move existing content types into a hidden row"/>
1806+
<severity value="MAJOR"/>
1807+
<useCaseId value="MC-965"/>
1808+
<testCaseId value="MC-3733"/>
1809+
<group value="pagebuilder"/>
1810+
<group value="pagebuilder-row"/>
1811+
<group value="pagebuilder-heading"/>
1812+
<group value="pagebuilder-hideShow"/>
1813+
</annotations>
1814+
<before>
1815+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1816+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1817+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1818+
</before>
1819+
<after>
1820+
<actionGroup ref="logout" stepKey="logout"/>
1821+
</after>
1822+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1823+
<argument name="group" value="PageBuilderHeadingContentType"/>
1824+
</actionGroup>
1825+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
1826+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
1827+
</actionGroup>
1828+
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading">
1829+
<argument name="index" value="1"/>
1830+
</actionGroup>
1831+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowContentTypeToStage">
1832+
<argument name="contentType" value="PageBuilderRowContentType"/>
1833+
</actionGroup>
1834+
<actionGroup ref="hideContentType" stepKey="hideContentType">
1835+
<argument name="section" value="RowOnStage"/>
1836+
<argument name="contentType" value="PageBuilderRowContentType"/>
1837+
<argument name="x" value="5"/>
1838+
<argument name="y" value="5"/>
1839+
</actionGroup>
1840+
<actionGroup ref="cannotMoveContentTypeToContainer" stepKey="cannotMoveHeadingToHidden">
1841+
<argument name="contentType" value="PageBuilderHeadingContentType" />
1842+
<argument name="containerTargetType" value="PageBuilderRowContentType" />
1843+
<argument name="containerTargetIndex" value="1" />
1844+
</actionGroup>
1845+
</test>
18001846
</tests>

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,4 +1129,50 @@
11291129
<dontSeeElementInDOM selector="{{HeadingOnStorefront.hidden('1')}}" stepKey="dontSeeHiddenElement"/>
11301130
<seeElement selector="{{HeadingOnStorefront.base('1')}}" stepKey="waitForContentTypeVisible" />
11311131
</test>
1132+
<test name="ValidateCannotMoveContentTypeIntoHiddenTab">
1133+
<annotations>
1134+
<features value="PageBuilder"/>
1135+
<stories value="Text"/>
1136+
<title value="Tab whilst hidden doesnt receive drop events"/>
1137+
<description value="A user isn't able to move existing content types into a hidden tab item"/>
1138+
<severity value="MAJOR"/>
1139+
<useCaseId value="MC-965"/>
1140+
<testCaseId value="MC-3734"/>
1141+
<group value="pagebuilder"/>
1142+
<group value="pagebuilder-heading"/>
1143+
<group value="pagebuilder-tab"/>
1144+
<group value="pagebuilder-tabGroup"/>
1145+
<group value="pagebuilder-hideShow"/>
1146+
</annotations>
1147+
<before>
1148+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1149+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1150+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1151+
</before>
1152+
<after>
1153+
<actionGroup ref="logout" stepKey="logout"/>
1154+
</after>
1155+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1156+
<argument name="group" value="PageBuilderHeadingContentType"/>
1157+
</actionGroup>
1158+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
1159+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
1160+
</actionGroup>
1161+
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading">
1162+
<argument name="index" value="1"/>
1163+
</actionGroup>
1164+
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnTypeToStage">
1165+
<argument name="contentType" value="PageBuilderTabsContentType"/>
1166+
</actionGroup>
1167+
<click selector="{{TabsOnStage.tabsContainer}}" stepKey="focusTabsElement"/>
1168+
<actionGroup ref="hideContentType" stepKey="hideContentType">
1169+
<argument name="section" value="TabsOnStage"/>
1170+
<argument name="contentType" value="PageBuilderTabsContentType"/>
1171+
</actionGroup>
1172+
<actionGroup ref="cannotMoveContentTypeToContainer" stepKey="cannotMoveHeadingToHidden">
1173+
<argument name="contentType" value="PageBuilderHeadingContentType" />
1174+
<argument name="containerTargetType" value="PageBuilderTabContentType" />
1175+
<argument name="containerTargetIndex" value="1" />
1176+
</actionGroup>
1177+
</test>
11321178
</tests>

0 commit comments

Comments
 (0)