|
7 | 7 | -->
|
8 | 8 |
|
9 | 9 | <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
10 |
| - xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd"> |
| 10 | + xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd"> |
11 | 11 | <actionGroup name="validateGroupsAndContentTypes">
|
12 | 12 | <see userInput="General" selector="{{PageBuilderActionsSection.generalGroup}}" stepKey="seeGeneralGroup"/>
|
13 | 13 | <see userInput="Row" selector="{{PageBuilderActionsSection.generalGroupBlock}}" stepKey="seeGeneralGroupRow"/>
|
|
79 | 79 | <dragAndDrop selector1="{{PageBuilderActionsSection.draggableContentBlockInPanel(contentBlockType.name)}}" selector2="{{PageBuilderActionsSection.dropAreaInStage}}" stepKey="dropContentBlockIntoStage"/>
|
80 | 80 | <waitForLoadingMaskToDisappear stepKey="waitForAnimation" />
|
81 | 81 | <waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentBlockInStage(contentBlockType.role)}}" stepKey="waitForContentBlockInStage" />
|
| 82 | + <waitForPageLoad stepKey="waitForToolbarsToLoad" time="30"/> |
82 | 83 | </actionGroup>
|
83 | 84 | <actionGroup name="dragContentBlockToStageByIndex">
|
84 | 85 | <arguments>
|
85 | 86 | <argument name="contentBlockType" defaultValue=""/>
|
86 | 87 | <argument name="contentBlockNumber" defaultValue="1" type="string"/>
|
87 | 88 | </arguments>
|
88 | 89 | <dragAndDrop selector1="{{PageBuilderActionsSection.draggableContentBlockInPanel(contentBlockType.name)}}" selector2="{{PageBuilderActionsSection.dropAreaInStage}}" stepKey="dropContentBlockIntoStage"/>
|
89 |
| - <waitForLoadingMaskToDisappear stepKey="waitForAnimation" /> |
| 90 | + <waitForPageLoad stepKey="waitForAnimation" time="30"/> |
90 | 91 | <waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentBlockInStageByIndex(contentBlockType.role, contentBlockNumber)}}" stepKey="waitForContentBlockInStage" />
|
| 92 | + <waitForPageLoad stepKey="waitForToolbarsToLoad" time="30"/> |
91 | 93 | </actionGroup>
|
92 | 94 | <actionGroup name="dragContentBlockToStageAndExpectEditPanel">
|
93 | 95 | <arguments>
|
|
109 | 111 | </arguments>
|
110 | 112 | <scrollTo selector="{{CmsNewPagePageActionsSection.contentSectionName}}" stepKey="scrollToTopOfStage"/>
|
111 | 113 | <dragAndDrop selector1="{{PageBuilderActionsSection.draggableContentBlockInPanel(contentBlockType.name)}}" selector2="{{PageBuilderActionsSection.contentBlockContainer(containerTargetType.role, containerTargetIndex)}}" stepKey="dropContentBlockIntoStage"/>
|
| 114 | + <waitForPageLoad stepKey="waitForAnimation" time="30"/> |
| 115 | + <waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentBlockInStageByIndex(contentBlockType.role, contentBlockIndex)}}" stepKey="waitForContentBlockInStage" /> |
| 116 | + <waitForPageLoad stepKey="waitForToolbarsToLoad" time="30"/> |
| 117 | + </actionGroup> |
| 118 | + <actionGroup name="dragContentBlockNextToExistingContentBlock"> |
| 119 | + <arguments> |
| 120 | + <argument name="contentBlockType" defaultValue=""/> |
| 121 | + <argument name="existingContentBlock" defaultValue=""/> |
| 122 | + <argument name="existingContentBlockIndex" defaultValue="1" type="string"/> |
| 123 | + <argument name="contentBlockIndex" defaultValue="1" type="string"/> |
| 124 | + <argument name="offsetXCoordinate" defaultValue="0" type="string"/> |
| 125 | + <argument name="offsetYCoordinate" defaultValue="0" type="string"/> |
| 126 | + </arguments> |
| 127 | + <scrollTo selector="{{CmsNewPagePageActionsSection.contentSectionName}}" stepKey="scrollToTopOfStage"/> |
| 128 | + <dragAndDrop selector1="{{PageBuilderActionsSection.draggableContentBlockInPanel(contentBlockType.name)}}" selector2="{{PageBuilderActionsSection.contentBlockInStageByIndex(existingContentBlock.role, existingContentBlockIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropContentBlockIntoStage"/> |
| 129 | + <waitForPageLoad stepKey="waitForAnimation" time="30"/> |
112 | 130 | <waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentBlockInStageByIndex(contentBlockType.role, contentBlockIndex)}}" stepKey="waitForContentBlockInStage" />
|
| 131 | + <waitForPageLoad stepKey="waitForToolbarsToLoad" time="30"/> |
113 | 132 | </actionGroup>
|
114 | 133 | <actionGroup name="openPageBuilderEditPanel">
|
115 | 134 | <arguments>
|
|
138 | 157 | <waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentBlockOptionsMenuByIndex(contentBlockType.role, contentBlockIndex)}}" stepKey="waitForOptions"/>
|
139 | 158 | <waitForElementVisible selector="{{PageBuilderActionsSection.contentBlockEditByIndex(contentBlockType.role, contentBlockIndex)}}" stepKey="waitForEditButton"/>
|
140 | 159 | <click selector="{{PageBuilderActionsSection.contentBlockEditByIndex(contentBlockType.role, contentBlockIndex)}}" stepKey="clickEditContentBlock"/>
|
141 |
| - <waitForLoadingMaskToDisappear stepKey="waitForAnimation"/> |
| 160 | + <waitForPageLoad stepKey="waitForAnimation1" time="30"/> |
142 | 161 | <waitForElementVisible selector="{{PageBuilderActionsSection.editForm}}" stepKey="waitForEditForm"/>
|
143 | 162 | <see userInput="Edit {{contentBlockType.name}}" selector="{{PageBuilderActionsSection.editFormTitle}}" stepKey="seeContentBlockNameInEditFormTitle"/>
|
144 |
| - <waitForLoadingMaskToDisappear stepKey="waitForAnimation2"/> |
| 163 | + <waitForPageLoad stepKey="waitForAnimation2" time="30"/> |
145 | 164 | </actionGroup>
|
146 | 165 | <actionGroup name="duplicateContentBlock">
|
147 | 166 | <arguments>
|
|
622 | 641 | <click selector="{{CmsPagesPageActionsSection.firstItemEditButton}}" stepKey="clickSelectEditOnFirstItem"/>
|
623 | 642 | <waitForPageLoad stepKey="waitForEditCmsPage" />
|
624 | 643 | </actionGroup>
|
625 |
| - <actionGroup name="enablePageBuilderSetting"> |
626 |
| - <amOnPage url="{{AdminContentManagementPage.url}}" stepKey="navigateToConfigurationPage" /> |
627 |
| - <waitForPageLoad stepKey="wait1"/> |
628 |
| - <conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.PageBuilderOptions}}" dependentSelector="{{ContentManagementSection.CheckIfPageBuilderTabExpanded}}" visible="true" /> |
629 |
| - <waitForElementVisible selector="{{ContentManagementSection.EnablePageBuilder}}" stepKey="waitForEnablePageBuilder" /> |
630 |
| - <selectOption selector="{{ContentManagementSection.EnablePageBuilder}}" userInput="Yes" stepKey="selectOption1"/> |
631 |
| - <click selector="{{ContentManagementSection.PageBuilderOptions}}" stepKey="collapsePageBuilderOptions" /> |
632 |
| - <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" /> |
633 |
| - <waitForPageLoad stepKey="wait2"/> |
634 |
| - </actionGroup> |
635 |
| - <actionGroup name="disablePageBuilderSetting"> |
636 |
| - <!-- Enable first since it's dependent on disable Disclaimer modal showing --> |
637 |
| - <amOnPage url="{{AdminContentManagementPage.url}}" stepKey="navigateToConfigurationPage1" /> |
638 |
| - <waitForPageLoad stepKey="waitForPageLoad1"/> |
639 |
| - <conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.PageBuilderOptions}}" dependentSelector="{{ContentManagementSection.CheckIfPageBuilderTabExpanded}}" visible="true"/> |
640 |
| - <waitForElementVisible selector="{{ContentManagementSection.EnablePageBuilder}}" stepKey="waitForEnablePageBuilder"/> |
641 |
| - <selectOption selector="{{ContentManagementSection.EnablePageBuilder}}" userInput="Yes" stepKey="selectOption1"/> |
642 |
| - <click selector="{{ContentManagementSection.PageBuilderOptions}}" stepKey="collapsePageBuilderOptions"/> |
643 |
| - <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/> |
644 |
| - <!-- NOW disable --> |
645 |
| - <amOnPage url="{{AdminContentManagementPage.url}}" stepKey="navigateToConfigurationPage2" /> |
646 |
| - <waitForPageLoad stepKey="waitForPageLoad2"/> |
647 |
| - <conditionalClick stepKey="expandPageBuilderTab" selector="{{PageBuilderCollapsibleSection.AdvancedContentToolsTab}}" dependentSelector="{{PageBuilderCollapsibleSection.CheckIfTabOpen}}" visible="true" /> |
648 |
| - <waitForElementVisible selector="{{PageBuilderCollapsibleSection.EnablePageBuilderDrp}}" stepKey="waitForEnablePageBuilderVisible" /> |
649 |
| - <selectOption selector="{{PageBuilderCollapsibleSection.EnablePageBuilderDrp}}" userInput="No" stepKey="selectNo"/> |
650 |
| - <waitForElementVisible selector="{{PageBuilderCollapsibleSection.DisclaimerMessage}}" stepKey="waitForPopUpMsg2"/> |
651 |
| - <waitForElementVisible selector="{{PageBuilderCollapsibleSection.TurnOffBtn}}" stepKey="waitForTurnOffButton"/> |
652 |
| - <click selector="{{PageBuilderCollapsibleSection.TurnOffBtn}}" stepKey="selectTurnOff" /> |
653 |
| - <waitForElementNotVisible selector="{{PageBuilderCollapsibleSection.DisclaimerMessage}}" stepKey="waitForPopupClose2"/> |
654 |
| - <seeOptionIsSelected selector="{{PageBuilderCollapsibleSection.EnablePageBuilderDrp}}" userInput="No" stepKey="verifyNoSelected"/> |
655 |
| - <click selector="{{PageBuilderCollapsibleSection.AdvancedContentToolsTab}}" stepKey="collapseAdvancedContentToolsTab" /> |
656 |
| - <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig2" /> |
657 |
| - <waitForPageLoad stepKey="waitForPageLoad3"/> |
658 |
| - </actionGroup> |
659 | 644 | <actionGroup name="verifyPageBuilderVisibleOnPage">
|
660 | 645 | <waitForElementVisible selector="{{PageBuilderActionsSection.identifyPageBuilder}}" stepKey="seePageBuilderVisible" />
|
661 | 646 | <dontSee userInput="Enable Advanced CMS" stepKey="dontSeeEnableAdvancedCMSBtn"/>
|
|
0 commit comments