PB-170: TinyMCE Performance is very poor with multiple instances on Stage

- Improve stability of tests

Author: davemacaulay

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup.xml

@@ -313,14 +313,16 @@
             <argument name="index" defaultValue="1" type="string"/>
             <argument name="variable"/>
         </arguments>
+        <waitForElementVisible selector="{{section.directive(index, variable.editPanelValue)}}" stepKey="waitForVariableVisible"/>
         <doubleClick selector="{{section.directive(index, variable.editPanelValue)}}" stepKey="doubleClickOnVariablePlaceholder"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForElementVisible selector="{{VariableSection.CancelBtnEnabled}}" stepKey="waitForCancelButton"/>
         <waitForElementVisible selector="{{VariableSection.Radio(variable.variableName)}}" stepKey="waitForVariableAfterDoubleClick"/>
     </actionGroup>
     <actionGroup name="closeVariablePanelTinyMCE">
         <waitForElementVisible selector="{{VariableSection.CancelBtnEnabled}}" stepKey="waitForCancelButton"/>
         <click selector="{{VariableSection.CancelBtnEnabled}}" stepKey="clickCancelButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForElementNotVisible selector="{{VariableSection.CancelBtnEnabled}}" stepKey="waitForVariableCancelNotVisible"/>
     </actionGroup>
     <actionGroup name="doubleClickWidgetTinyMCE">
@@ -329,13 +331,25 @@
             <argument name="index" defaultValue="1" type="string"/>
             <argument name="widget"/>
         </arguments>
+        <waitForElementVisible selector="{{section.directive('1', TinyMCEWidgetCMSPageLink.editPanelValue)}}" stepKey="waitForWidgetVisible"/>
         <doubleClick selector="{{section.directive('1', TinyMCEWidgetCMSPageLink.editPanelValue)}}" stepKey="doubleClickOnWidgetPlaceholder"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
         <waitForElementVisible selector="{{WidgetSection.CancelBtnEnabled}}" stepKey="waitForWidgetType"/>
     </actionGroup>
     <actionGroup name="closeWidgetPanelTinyMCE">
-        <click selector="{{WidgetSection.CancelBtnEnabled}}" stepKey="clickInsertWidget3"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear7"/>
+        <waitForElementVisible selector="{{WidgetSection.CancelBtnEnabled}}" stepKey="waitForCancelButton"/>
+        <click selector="{{WidgetSection.CancelBtnEnabled}}" stepKey="clickInsertWidget"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementNotVisible selector="{{WidgetSection.CancelBtnEnabled}}}" stepKey="waitForCancelButtonNotVisible"/>
+    </actionGroup>
+    <actionGroup name="focusTinyMCE">
+        <arguments>
+            <argument name="section" defaultValue="TextOnStage"/>
+            <argument name="index" defaultValue="1" type="string"/>
+        </arguments>
+        <waitForElementVisible selector="{{section.tinymce(index)}}" stepKey="waitForTinyMCE"/>
+        <click selector="{{section.tinymce(index)}}" stepKey="focusOnTextEditorArea"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementVisible selector="{{section.tinymceFocused(index)}}" stepKey="waitForTinyMCEFocus"/>
     </actionGroup>
 </actionGroups>

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

@@ -2840,7 +2840,7 @@
         <actionGroup ref="seeDirectiveFocusedTinyMCE" stepKey="seeDirectiveFocusedTinyMCE">
             <argument name="labelValue" value="TinyMCEVariableBaseURL.editPanelValue" />
         </actionGroup>
-        <!-- Save page and verify single clicking on widget will retain selection -->
+        <!-- Save page and verify single clicking on variable will retain selection -->
         <actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
         <actionGroup ref="clickDirectiveTinyMCE" stepKey="clickDirectiveTinyMCE2">
@@ -3019,8 +3019,8 @@
             <title value="TinyMCE4 selection is preserved after initiation"/>
             <description value="Verify that a users selection is not lost between select and initiation"/>
             <severity value="AVERAGE"/>
-            <useCaseId value="MC-29450"/>
-            <testCaseId value="PB-303"/>
+            <useCaseId value="PB-170"/>
+            <testCaseId value="MC-29450"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-text"/>
         </annotations>
@@ -3039,10 +3039,10 @@
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection1">
             <argument name="contentType" value="PageBuilderTextContentType"/>
         </actionGroup>
-        <actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoStage">
             <argument name="contentType" value="PageBuilderTextContentType"/>
         </actionGroup>
-        <click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
+        <actionGroup ref="focusTinyMCE" stepKey="focusTinyMCE"/>
         <!-- Create new Heading 2 -->
         <actionGroup ref="formatTextTinyMCE" stepKey="formatTextHeading2">
             <argument name="format" value="TinyMCEFormatHeading2"/>