|
11 | 11 | <actionGroup name="dragContentTypeToStage">
|
12 | 12 | <arguments>
|
13 | 13 | <argument name="contentType"/>
|
| 14 | + <argument name="containerTargetType" defaultValue="PageBuilderRowContentType"/> |
| 15 | + <argument name="containerTargetIndex" defaultValue="1" type="string"/> |
14 | 16 | </arguments>
|
15 | 17 | <waitForElementVisible time="30" selector="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" stepKey="waitForContentTypeInPanel"/>
|
16 |
| - <dragAndDrop selector1="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderStage.dropAreaInStage}}" stepKey="dropContentTypeIntoStage"/> |
17 |
| - <waitForLoadingMaskToDisappear stepKey="waitForAnimation" /> |
| 18 | + <dragAndDrop selector1="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderStage.contentTypeContainer(containerTargetType.role, containerTargetIndex)}}" stepKey="dropContentTypeIntoStage"/> |
| 19 | + <waitForPageLoad stepKey="waitForAnimation" time="30"/> |
18 | 20 | <waitForElementVisible time="10" selector="{{PageBuilderStage.contentTypeInStage(contentType.role)}}" stepKey="waitForContentTypeInStage" />
|
19 |
| - <waitForPageLoad stepKey="waitForToolbarsToLoad" time="30"/> |
20 | 21 | </actionGroup>
|
21 | 22 | <actionGroup name="dragContentTypeToStageByIndex">
|
22 | 23 | <arguments>
|
23 | 24 | <argument name="contentType"/>
|
24 | 25 | <argument name="contentTypeNumber" defaultValue="1" type="string"/>
|
| 26 | + <argument name="containerTargetType" defaultValue="PageBuilderRowContentType"/> |
| 27 | + <argument name="containerTargetIndex" defaultValue="1" type="string"/> |
25 | 28 | </arguments>
|
26 |
| - <dragAndDrop selector1="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderStage.dropAreaInStage}}" stepKey="dropContentTypeIntoStage"/> |
| 29 | + <waitForElementVisible time="30" selector="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" stepKey="waitForContentTypeInPanel"/> |
| 30 | + <dragAndDrop selector1="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderStage.contentTypeContainer(containerTargetType.role, containerTargetIndex)}}" stepKey="dropContentTypeIntoStage"/> |
27 | 31 | <waitForPageLoad stepKey="waitForAnimation" time="30"/>
|
28 | 32 | <waitForElementVisible time="10" selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeNumber)}}" stepKey="waitForContentTypeInStage" />
|
29 |
| - <waitForPageLoad stepKey="waitForToolbarsToLoad" time="30"/> |
30 | 33 | </actionGroup>
|
31 | 34 | <actionGroup name="dragContentTypeToContainer">
|
32 | 35 | <arguments>
|
|
36 | 39 | <argument name="containerTargetIndex" defaultValue="1" type="string"/>
|
37 | 40 | <argument name="offsetXCoordinate" defaultValue="null" type="string"/>
|
38 | 41 | <argument name="offsetYCoordinate" defaultValue="null" type="string"/>
|
| 42 | + <argument name="pageBuilderArea" defaultValue="" type="string"/> |
39 | 43 | </arguments>
|
40 |
| - <click selector="{{PageBuilderPanel.searchPanel}}" stepKey="lostFocus"/> |
41 |
| - <waitForElementVisible time="30" selector="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" stepKey="waitForContentTypeInPanel"/> |
42 |
| - <dragAndDrop selector1="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderStage.contentTypeContainer(containerTargetType.role, containerTargetIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropContentTypeIntoStage"/> |
| 44 | + <click selector="{{pageBuilderArea}}{{PageBuilderPanel.searchPanel}}" stepKey="lostFocus"/> |
| 45 | + <waitForElementVisible time="30" selector="{{pageBuilderArea}}{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" stepKey="waitForContentTypeInPanel"/> |
| 46 | + <dragAndDrop selector1="{{pageBuilderArea}}{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderStage.contentTypeContainer(containerTargetType.role, containerTargetIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropContentTypeIntoStage"/> |
43 | 47 | <waitForPageLoad stepKey="waitForAnimation" time="30"/>
|
44 | 48 | <waitForElementVisible time="10" selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInStage" />
|
45 | 49 | <waitForPageLoad stepKey="waitForToolbarsToLoad" time="30"/>
|
|
83 | 87 | <argument name="dropZoneIndex" defaultValue="1" type="string"/>
|
84 | 88 | <argument name="offsetXCoordinate" defaultValue="null" type="string"/>
|
85 | 89 | <argument name="offsetYCoordinate" defaultValue="null" type="string"/>
|
| 90 | + <argument name="pageBuilderArea" defaultValue="" type="string"/> |
86 | 91 | </arguments>
|
87 |
| - <scrollTo selector="{{CmsNewPagePageActionsSection.contentSectionName}}" stepKey="scrollToTopOfStage"/> |
88 |
| - <waitForElement time="30" selector="{{PageBuilderStage.dropZone(containerTargetType.role, containerTargetIndex, dropZoneIndex)}}" stepKey="waitForStageActive"/> |
89 |
| - <dragAndDrop selector1="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderStage.dropZone(containerTargetType.role, containerTargetIndex, dropZoneIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropContentTypeIntoStage"/> |
| 92 | + <click selector="{{pageBuilderArea}}{{PageBuilderPanel.searchPanel}}" stepKey="loseFocus"/> |
| 93 | + <waitForElementVisible time="30" selector="{{pageBuilderArea}}{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" stepKey="waitForContentTypeInPanel"/> |
| 94 | + <dragAndDrop selector1="{{pageBuilderArea}}{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderStage.dropZone(containerTargetType.role, containerTargetIndex, dropZoneIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropContentTypeIntoStage"/> |
90 | 95 | <waitForPageLoad time="30" stepKey="waitForAnimation"/>
|
91 | 96 | <waitForElementVisible time="30" selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInStage"/>
|
92 | 97 | </actionGroup>
|
|
0 commit comments