|
110 | 110 | <argument name="containerTargetIndex" defaultValue="1" type="string"/>
|
111 | 111 | </arguments>
|
112 | 112 | <scrollTo selector="{{CmsNewPagePageActionsSection.contentSectionName}}" stepKey="scrollToTopOfStage"/>
|
113 |
| - <dragAndDrop selector1="{{PageBuilderActionsSection.draggableContentBlockInPanel(contentType.name)}}" selector2="{{PageBuilderActionsSection.contentTypeContainer(containerTargetType.role, containerTargetIndex)}}" stepKey="dropContentBlockIntoStage"/> |
| 113 | + <dragAndDrop selector1="{{PageBuilderActionsSection.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderActionsSection.contentTypeContainer(containerTargetType.role, containerTargetIndex)}}" stepKey="dropContentTypeIntoStage"/> |
114 | 114 | <waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
|
115 |
| - <waitForElementVisible time="30" selector="{{PageBuilderActionsSection.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentBlockInContainer"/> |
116 |
| - <waitForElementVisible time="30" selector="{{PageBuilderActionsSection.editFormTitle}}" stepKey="waitForContentBlockNameInEditFormTitle"/> |
117 |
| - <see userInput="Edit {{contentType.editPanelName}}" selector="{{PageBuilderActionsSection.editFormTitle}}" stepKey="seeContentBlockNameInEditFormTitle"/> |
| 115 | + <waitForElementVisible time="30" selector="{{PageBuilderActionsSection.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInContainer"/> |
| 116 | + <waitForElementVisible time="30" selector="{{PageBuilderActionsSection.editFormTitle}}" stepKey="waitForContentTypeNameInEditFormTitle"/> |
| 117 | + <see userInput="Edit {{contentType.editPanelName}}" selector="{{PageBuilderActionsSection.editFormTitle}}" stepKey="seeContentTypeNameInEditFormTitle"/> |
118 | 118 | </actionGroup>
|
119 | 119 | <actionGroup name="dragContentTypeToContainer">
|
120 | 120 | <arguments>
|
|
132 | 132 | <waitForPageLoad stepKey="waitForToolbarsToLoad" time="30"/>
|
133 | 133 | </actionGroup>
|
134 | 134 | <!-- Test to ensure a content block doesn't receive drop events -->
|
135 |
| - <actionGroup name="dragContentBlockToContentBlock"> |
| 135 | + <actionGroup name="dragContentTypeToContentType"> |
136 | 136 | <arguments>
|
137 |
| - <argument name="contentBlockType"/> |
138 |
| - <argument name="contentBlockIndex" defaultValue="1" type="string"/> |
| 137 | + <argument name="contentType"/> |
| 138 | + <argument name="contentTypeIndex" defaultValue="1" type="string"/> |
139 | 139 | <argument name="targetBlockType"/>
|
140 | 140 | <argument name="offsetXCoordinate" defaultValue="null" type="string"/>
|
141 | 141 | <argument name="offsetYCoordinate" defaultValue="null" type="string"/>
|
142 | 142 | </arguments>
|
143 | 143 | <scrollTo selector="{{CmsNewPagePageActionsSection.contentSectionName}}" stepKey="scrollToTopOfStage"/>
|
144 |
| - <dragAndDrop selector1="{{PageBuilderActionsSection.draggableContentBlockInPanel(contentBlockType.name)}}" selector2="{{PageBuilderActionsSection.contentBlockInStage(targetBlockType.role)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropContentBlockIntoStage"/> |
| 144 | + <dragAndDrop selector1="{{PageBuilderActionsSection.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderActionsSection.contentTypeInStage(targetBlockType.role)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropContentTypeIntoStage"/> |
145 | 145 | <waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
|
146 |
| - <waitForElementVisible time="30" selector="{{PageBuilderActionsSection.contentBlockInStageByIndex(contentBlockType.role, contentBlockIndex)}}" stepKey="waitForContentBlockInStage"/> |
| 146 | + <waitForElementVisible time="30" selector="{{PageBuilderActionsSection.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInStage"/> |
147 | 147 | </actionGroup>
|
148 |
| - <actionGroup name="dragContentBlockToDropZone"> |
| 148 | + <actionGroup name="dragContentTypeToDropZone"> |
149 | 149 | <arguments>
|
150 |
| - <argument name="contentBlockType"/> |
151 |
| - <argument name="contentBlockIndex" defaultValue="1" type="string"/> |
| 150 | + <argument name="contentType"/> |
| 151 | + <argument name="contentTypeIndex" defaultValue="1" type="string"/> |
152 | 152 | <argument name="containerTargetType"/>
|
153 | 153 | <argument name="containerTargetIndex" defaultValue="1" type="string"/>
|
154 | 154 | <argument name="dropZoneIndex" defaultValue="1" type="string"/>
|
|
157 | 157 | </arguments>
|
158 | 158 | <scrollTo selector="{{CmsNewPagePageActionsSection.contentSectionName}}" stepKey="scrollToTopOfStage"/>
|
159 | 159 | <waitForElement time="30" selector="{{PageBuilderActionsSection.dropZone(containerTargetType.role, containerTargetIndex, dropZoneIndex)}}" stepKey="waitForStageActive"/>
|
160 |
| - <dragAndDrop selector1="{{PageBuilderActionsSection.draggableContentBlockInPanel(contentBlockType.name)}}" selector2="{{PageBuilderActionsSection.dropZone(containerTargetType.role, containerTargetIndex, dropZoneIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropContentBlockIntoStage"/> |
| 160 | + <dragAndDrop selector1="{{PageBuilderActionsSection.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderActionsSection.dropZone(containerTargetType.role, containerTargetIndex, dropZoneIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropContentTypeIntoStage"/> |
161 | 161 | <waitForPageLoad time="30" stepKey="waitForAnimation"/>
|
162 |
| - <waitForElementVisible time="30" selector="{{PageBuilderActionsSection.contentBlockInStageByIndex(contentBlockType.role, contentBlockIndex)}}" stepKey="waitForContentBlockInStage"/> |
| 162 | + <waitForElementVisible time="30" selector="{{PageBuilderActionsSection.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInStage"/> |
163 | 163 | </actionGroup>
|
164 | 164 | <actionGroup name="moveContentTypeToContainer">
|
165 | 165 | <arguments>
|
166 |
| - <argument name="contentBlockType"/> |
167 |
| - <argument name="contentBlockIndex" defaultValue="1" type="string"/> |
| 166 | + <argument name="contentType"/> |
| 167 | + <argument name="contentTypeIndex" defaultValue="1" type="string"/> |
168 | 168 | <argument name="containerTargetType"/>
|
169 | 169 | <argument name="containerTargetIndex" defaultValue="1" type="string"/>
|
170 | 170 | <argument name="offsetXCoordinate" defaultValue="10" type="string"/>
|
171 | 171 | <argument name="offsetYCoordinate" defaultValue="0" type="string"/>
|
172 | 172 | <argument name="containerOffsetXCoordinate" defaultValue="null" type="string"/>
|
173 | 173 | <argument name="containerOffsetYCoordinate" defaultValue="null" type="string"/>
|
174 | 174 | </arguments>
|
175 |
| - <waitForElementVisible time="20" selector="{{PageBuilderActionsSection.contentBlockInStageByIndex(contentBlockType.role, contentBlockIndex)}}" stepKey="waitForContentBlockInStageVisible"/> |
176 |
| - <moveMouseOver selector="{{PageBuilderActionsSection.contentBlockInStageByIndex(contentBlockType.role, contentBlockIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="onMouseOverContentBlockStage"/> |
| 175 | + <waitForElementVisible time="20" selector="{{PageBuilderActionsSection.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInStageVisible"/> |
| 176 | + <moveMouseOver selector="{{PageBuilderActionsSection.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="onMouseOverContentTypeStage"/> |
177 | 177 | <waitForPageLoad time="30" stepKey="waitForAnimation"/>
|
178 |
| - <waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentBlockOptionsMenuByIndex(contentBlockType.role, contentBlockIndex)}}" stepKey="waitForOptions"/> |
179 |
| - <waitForElementVisible selector="{{PageBuilderActionsSection.contentBlockMoveByIndex(contentBlockType.role, contentBlockIndex)}}" stepKey="waitForEditButton"/> |
180 |
| - <dragAndDrop selector1="{{PageBuilderActionsSection.contentBlockMoveByIndex(contentBlockType.role, contentBlockIndex)}}" selector2="{{PageBuilderActionsSection.contentBlockContainer(containerTargetType.role, containerTargetIndex)}}" x="{{containerOffsetXCoordinate}}" y="{{containerOffsetYCoordinate}}" stepKey="moveContentTypeIntoContainer"/> |
| 178 | + <waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentTypeOptionsMenuByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForOptions"/> |
| 179 | + <waitForElementVisible selector="{{PageBuilderActionsSection.contentTypeMoveByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForEditButton"/> |
| 180 | + <dragAndDrop selector1="{{PageBuilderActionsSection.contentTypeMoveByIndex(contentType.role, contentTypeIndex)}}" selector2="{{PageBuilderActionsSection.contentTypeContainer(containerTargetType.role, containerTargetIndex)}}" x="{{containerOffsetXCoordinate}}" y="{{containerOffsetYCoordinate}}" stepKey="moveContentTypeIntoContainer"/> |
181 | 181 | <waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
|
182 |
| - <waitForElementVisible time="30" selector="{{PageBuilderActionsSection.contentBlockInStageByIndex(contentBlockType.role, contentBlockIndex)}}" stepKey="waitForContentBlockInStage"/> |
| 182 | + <waitForElementVisible time="30" selector="{{PageBuilderActionsSection.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInStage"/> |
183 | 183 | </actionGroup>
|
184 | 184 | <actionGroup name="dragContentTypeNextToExistingContentType">
|
185 | 185 | <arguments>
|
|
835 | 835 | <fillField selector="{{ColorPicker.inputField}}" userInput=" " stepKey="inputBlueHexCodeIntoInputField1"/>
|
836 | 836 | <pressKey selector="{{ColorPicker.inputField}}" parameterArray="['{{colorCode.value}}',\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressKeyEnter"/>
|
837 | 837 | </actionGroup>
|
838 |
| - <actionGroup name="validateContentBlockHeightOnStage"> |
| 838 | + <actionGroup name="validateContentTypeHeightOnStage"> |
839 | 839 | <arguments>
|
840 |
| - <argument name="contentBlock"/> |
| 840 | + <argument name="contentType"/> |
841 | 841 | <argument name="index" defaultValue="1" type="string"/>
|
842 | 842 | <argument name="containerDefaultHeight" defaultValue="1"/>
|
843 | 843 | <argument name="expectedPaddingTop" defaultValue="1"/>
|
844 | 844 | <argument name="expectedPaddingBottom" defaultValue="1"/>
|
845 | 845 | </arguments>
|
846 |
| - <executeJS function="{{PageBuilderActionsSection.computedHeightOnStage(contentBlock.role,index)}}" stepKey="actualStageContentBlockHeight"/> |
847 |
| - <executeJS function="return Math.round({{containerDefaultHeight.value}}+{{expectedPaddingTop.paddingTop}}+{{expectedPaddingBottom.paddingBottom}})" stepKey="expectedContentBlockHeightWithPadding"/> |
| 846 | + <executeJS function="{{PageBuilderActionsSection.computedHeightOnStage(contentType.role,index)}}" stepKey="actualStageContentTypeHeight"/> |
| 847 | + <executeJS function="return Math.round({{containerDefaultHeight.value}}+{{expectedPaddingTop.paddingTop}}+{{expectedPaddingBottom.paddingBottom}})" stepKey="expectedContentTypeHeightWithPadding"/> |
848 | 848 | <assertEquals stepKey="assertHeightOnStageMatchesExpected">
|
849 |
| - <expectedResult type="variable">actualStageContentBlockHeight</expectedResult> |
850 |
| - <actualResult type="variable">expectedContentBlockHeightWithPadding</actualResult> |
| 849 | + <expectedResult type="variable">actualStageContentTypeHeight</expectedResult> |
| 850 | + <actualResult type="variable">expectedContentTypeHeightWithPadding</actualResult> |
851 | 851 | </assertEquals>
|
852 | 852 | </actionGroup>
|
853 |
| - <actionGroup name="validateContentBlockHeightOnStageWithoutPadding"> |
| 853 | + <actionGroup name="validateContentTypeHeightOnStageWithoutPadding"> |
854 | 854 | <arguments>
|
855 |
| - <argument name="contentBlock"/> |
| 855 | + <argument name="contentType"/> |
856 | 856 | <argument name="index" defaultValue="1" type="string"/>
|
857 | 857 | <argument name="containerDefaultHeight" defaultValue="1"/>
|
858 | 858 | </arguments>
|
859 |
| - <executeJS function="{{PageBuilderActionsSection.computedHeightOnStage(contentBlock.role,index)}}" stepKey="actualStageContentBlockHeight"/> |
860 |
| - <executeJS function="return Math.round({{containerDefaultHeight.value}})" stepKey="expectedContentBlockHeightWithPadding"/> |
| 859 | + <executeJS function="{{PageBuilderActionsSection.computedHeightOnStage(contentType.role,index)}}" stepKey="actualStageContentTypeHeight"/> |
| 860 | + <executeJS function="return Math.round({{containerDefaultHeight.value}})" stepKey="expectedContentTypeHeightWithPadding"/> |
861 | 861 | <assertEquals stepKey="assertHeightOnStageMatchesExpected">
|
862 |
| - <expectedResult type="variable">actualStageContentBlockHeight</expectedResult> |
863 |
| - <actualResult type="variable">expectedContentBlockHeightWithPadding</actualResult> |
| 862 | + <expectedResult type="variable">actualStageContentTypeHeight</expectedResult> |
| 863 | + <actualResult type="variable">expectedContentTypeHeightWithPadding</actualResult> |
864 | 864 | </assertEquals>
|
865 | 865 | </actionGroup>
|
866 |
| - <actionGroup name="validateContentBlockInsideContainerStage"> |
| 866 | + <actionGroup name="validateContentTypeInsideContainerStage"> |
867 | 867 | <arguments>
|
868 |
| - <argument name="contentBlockType"/> |
869 |
| - <argument name="contentBlockIndex" defaultValue="1" type="string"/> |
| 868 | + <argument name="contentType"/> |
| 869 | + <argument name="contentTypeIndex" defaultValue="1" type="string"/> |
870 | 870 | <argument name="containerTargetType"/>
|
871 | 871 | <argument name="containerTargetIndex" defaultValue="1" type="string"/>
|
872 | 872 | <argument name="positionInContainer" defaultValue="1" type="string"/>
|
873 | 873 | </arguments>
|
874 |
| - <waitForElementVisible time="30" selector="{{PageBuilderActionsSection.contentBlockInsideContainerStage(containerTargetType.role, containerTargetIndex, positionInContainer, contentBlockType.role, contentBlockIndex)}}" stepKey="waitForContentBlockStage"/> |
| 874 | + <waitForElementVisible time="30" selector="{{PageBuilderActionsSection.contentTypeInsideContainerStage(containerTargetType.role, containerTargetIndex, positionInContainer, contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeStage"/> |
875 | 875 | </actionGroup>
|
876 |
| - <actionGroup name="validateContentBlockInsideContainerStorefront"> |
| 876 | + <actionGroup name="validateContentTypeInsideContainerStorefront"> |
877 | 877 | <arguments>
|
878 |
| - <argument name="contentBlockType"/> |
879 |
| - <argument name="contentBlockIndex" defaultValue="1" type="string"/> |
| 878 | + <argument name="contentType"/> |
| 879 | + <argument name="contentTypeIndex" defaultValue="1" type="string"/> |
880 | 880 | <argument name="containerTargetType"/>
|
881 | 881 | <argument name="containerTargetIndex" defaultValue="1" type="string"/>
|
882 | 882 | </arguments>
|
883 |
| - <waitForElementVisible time="30" selector="{{PageBuilderActionsSection.contentBlockInsideContainerStorefront(containerTargetType.role, containerTargetIndex, contentBlockType.role, contentBlockIndex)}}" stepKey="waitForContentBlockStorefront"/> |
| 883 | + <waitForElementVisible time="30" selector="{{PageBuilderActionsSection.contentTypeInsideContainerStorefront(containerTargetType.role, containerTargetIndex, contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeStorefront"/> |
884 | 884 | </actionGroup>
|
885 | 885 | </actionGroups>
|
0 commit comments