MC-1438: Editing Text Content Block from the Stage with WYSIWYG turned off completely or by default

Author: kieuphan2406

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection.xml

@@ -12,6 +12,7 @@
         <element name="textAreaText" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[.='{{arg2}}']" parameterized="true"/>
         <element name="textAreaTextContains" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//textarea[contains(@value,'{{arg2}}')]" parameterized="true"/>
         <element name="text" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div//*[contains(.,'{{arg2}}')]" parameterized="true"/>
+        <element name="textString" type="text" selector="//*[contains(@class, 'pagebuilder-text')]//*[text()='{{agr}}']" parameterized="true"/>
         <element name="mcePlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div//*[starts-with(@id, '{{arg2}}')]" parameterized="true"/>
         <element name="variablePlaceholder" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//*[@data-bind='html: data.main.html']//*[contains(@class, 'magento-variable magento-placeholder')]" parameterized="true"/>
         <element name="widgetPlaceholder" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//*[@data-bind='html: data.main.html']//*[contains(@class, 'magento-placeholder magento-widget')]" parameterized="true"/>

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

@@ -57,16 +57,16 @@
             <argument name="contentType" value="PageBuilderTextContentType"/>
         </actionGroup>
         <!-- Add image to TextArea -->
-        <comment userInput="Add image to TextArea" stepKey="comment1"/>
-        <waitForElementVisible selector="{{TextOnConfiguration.insertImageButton}}" stepKey="waitForInsertImage"/>
-        <click selector="{{TextOnConfiguration.insertImageButton}}" stepKey="clickInsertImage"/>
-        <actionGroup ref="CreateImageFolder" stepKey="CreateImageFolder">
-            <argument name="ImageFolder" value="ImageFolder"/>
-        </actionGroup>
-        <actionGroup ref="attachImage" stepKey="attachImage1">
-            <argument name="Image" value="ImageUpload3"/>
-        </actionGroup>
-        <actionGroup ref="saveImage" stepKey="insertImage"/>
+        <!--<comment userInput="Add image to TextArea" stepKey="comment1"/>-->
+        <!--<waitForElementVisible selector="{{TextOnConfiguration.insertImageButton}}" stepKey="waitForInsertImage"/>-->
+        <!--<click selector="{{TextOnConfiguration.insertImageButton}}" stepKey="clickInsertImage"/>-->
+        <!--<actionGroup ref="CreateImageFolder" stepKey="CreateImageFolder">-->
+            <!--<argument name="ImageFolder" value="ImageFolder"/>-->
+        <!--</actionGroup>-->
+        <!--<actionGroup ref="attachImage" stepKey="attachImage1">-->
+            <!--<argument name="Image" value="ImageUpload3"/>-->
+        <!--</actionGroup>-->
+        <!--<actionGroup ref="saveImage" stepKey="insertImage"/>-->
         <!-- Add widget to TextArea -->
         <comment userInput="Add widget to TextArea" stepKey="comment2"/>
         <actionGroup ref="addPageLinkWidgetWYSIWYGDisabled" stepKey="addPageLinkWidgetWYSIWYGDisabled">
@@ -78,6 +78,7 @@
         <actionGroup ref="addPageLinkVariableWYSIWYGDisabled" stepKey="addPageLinkVariableWYSIWYGDisabled">
             <argument name="variable" value="PageBuilderTextArea_VariableBaseURL"/>
         </actionGroup>
+        <executeJS function="return document.getElementById('{{TextOnConfiguration.textAreaId}}').value;" stepKey="expectedData"/>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
         <actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage3"/>
         <!-- Switch to TinyMCE4 -->
@@ -89,24 +90,24 @@
         <reloadPage stepKey="reloadPage"/>
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage3"/>
         <waitForElementVisible selector="{{TextOnStage.tinymce('1')}}" stepKey="waitforTinyMCE4"/>
-        <waitForElementVisible selector="//*[contains(@class, 'pagebuilder-text')]//*[text()='{{PageBuilderTextProperty.value}}']" stepKey="waitForText"/>
-        <waitForElementVisible selector="{{TextOnStage.tinymce('1')}}{{CmsWYSIWYGSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSourceOnStage2"/>
+        <!--<waitForElementVisible selector="//*[contains(@class, 'pagebuilder-text')]//*[text()='{{PageBuilderTextProperty.value}}']" stepKey="waitForText"/>-->
+        <waitForElementVisible selector="{{TextOnStage.textString('1', PageBuilderTextProperty.value})}}" stepKey="waitForText"/>
+        <!--<waitForElementVisible selector="{{TextOnStage.tinymce('1')}}{{CmsWYSIWYGSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSourceOnStage2"/>-->
         <waitForElementVisible selector="{{TextOnStage.text('1', TinyMCEVariableBaseURL.editPanelValue)}}" stepKey="waitForVariabBaseURL"/>
         <waitForElementVisible selector="{{TextOnStage.variablePlaceholder('1')}}" stepKey="waitForVariablePlaceholder"/>
         <waitForElementVisible selector="{{TextOnStage.text('1', TinyMCEWidgetCMSPageLink.editPanelValue)}}" stepKey="waitForWidgetValue"/>
         <waitForElementVisible selector="{{TextOnStage.widgetPlaceholder('1')}}" stepKey="waitForWidgetPlaceholder"/>
-        <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
+        <actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage4"/>
         <!-- Switch to TinyMCE3 -->
         <comment userInput="Switch to TinyMCE3" stepKey="comment6"/>
         <magentoCLI command="config:set cms/wysiwyg/editor Magento_Tinymce3/tinymce3Adapter" stepKey="enableTinyMCE3"/>
         <reloadPage stepKey="reloadPage1"/>
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage4"/>
-        <executeJS function="return document.evaluate(&quot;{{TextOnStage.textArea('1')}}&quot;, document.body).iterateNext().value" stepKey="textareaValue"/>
+        <executeJS function="return document.evaluate(&quot;{{TextOnStage.textArea('1')}}&quot;, document.body).iterateNext().value" stepKey="actualData"/>
         <assertEquals stepKey="assertTextValue">
-            <expectedResult type="string">{{PageBuilderTextProperty.value}}{{CmsWYSIWYGSection.imageSource(ImageUpload3.fileName)}}{{TinyMCEVariableBaseURL.editPanelValue}}{{TinyMCEWidgetCMSPageLink.editPanelValue}}</expectedResult>
-            <actualResult type="variable">textareaValue</actualResult>
+            <expectedResult type="variable">expectedData</expectedResult>
+            <actualResult type="variable">actualData</actualResult>
         </assertEquals>
-
     </test>
     <test name="TextAreaInitalStatus">
         <annotations>