MC-4254: Text Height Inconsistency On Stage & Storefront

 - update action group
 - remove check for min height in text elements

Author: cspruiell

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

@@ -108,19 +108,10 @@
         </arguments>
         <click selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" stepKey="focusOnEditorArea"/>
         <waitForElementVisible selector="{{PageBuilderStage.inlineWYSIWYGEditorPanel(contentType.role, index)}}" stepKey="waitForEditorPanel"/>
-        <fillField selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" userInput="{{content}}" stepKey="enterContentIntoEditor"/>
+        <pressKey selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" userInput="{{content}}" stepKey="enterContentIntoEditor"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocusFromEditor"/>
     </actionGroup>
-    <actionGroup name="inlineEditTextWYSIWYGFromStage">
-        <arguments>
-            <argument name="content" type="string"/>
-            <argument name="index" defaultValue="1" type="string"/>
-        </arguments>
-        <click selector="{{TextOnStage.tinymce(index)}}" stepKey="focusOnEditorArea"/>
-        <pressKey selector="{{TextOnStage.tinymce(index)}}" userInput="{{content}}" stepKey="fillTextToTinyMCE4"/>
-        <click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocusFromEditor"/>
-    </actionGroup>
     <actionGroup name="inlineEditTextAreaFromStage">
         <arguments>
             <argument name="contentType"/>

app/code/Magento/PageBuilder/Test/Mftf/Data/TextData.xml

@@ -15,7 +15,6 @@
         <data key="fieldName">text</data>
         <data key="cmsPageLinkName" unique="suffix">cms-page-link-</data>
         <data key="value">test string</data>
-        <data key="minHeight">50px</data>
     </entity>
     <entity name="PageBuilderTextContentTypeDefault" type="pagebuilder_text_property">
         <data key="name">Text</data>

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

@@ -38,8 +38,8 @@
         <element name="uploadImageInput" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//input[@name='background_image']"/>
         <element name="onHoverUploadImageButton" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-{{arg1}}')])[{{arg2}}]//label[text()='Upload Image']" parameterized="true"/>
         <element name="onHoverSelectFromGalleryButton" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-{{arg1}}')])[{{arg2}}]//ul[contains(@class,'pagebuilder-options-links')]//label[text()='Select from Gallery']" parameterized="true"/>
-        <element name="inlineWYSIWYGEditor" type="text" selector="(//div[@data-role='{{arg1}}'])[{{arg2}}]//div[contains(@class,'inline-wysiwyg')]" parameterized="true"/>
-        <element name="inlineWYSIWYGEditorPanel" type="button" selector="(//div[@data-role='{{arg1}}'])[{{arg2}}]//div[contains(@class,'mce-tinymce-inline')]" parameterized="true"/>
+        <element name="inlineWYSIWYGEditor" type="text" selector="(//div[@data-role='{{arg1}}'])[{{arg2}}]//div[contains(@class,'inline-wysiwyg')]|(//div[@data-role='{{arg1}}' and contains(@class,'inline-wysiwyg')])[{{arg2}}]" parameterized="true"/>
+        <element name="inlineWYSIWYGEditorPanel" type="button" selector="(//div[@data-role='{{arg1}}'])[{{arg2}}]//div[contains(@class,'mce-tinymce-inline')]|(//div[@data-role='{{arg1}}'])[{{arg2}}][following-sibling::div[contains(@class,'mce-tinymce-inline')]]" parameterized="true"/>
         <element name="inlineTextAreaEditor" type="button" selector="(//div[@data-role='{{arg1}}'])[{{arg2}}]//textarea[@class='inline-wysiwyg-textarea']" parameterized="true"/>
     </section>
     <section name="PageBuilderPanel">

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

@@ -178,22 +178,13 @@
         <!--Assert Text placeholder and inline edit-->
         <comment userInput="Assert Text placeholder and inline edit" stepKey="comment1"/>
         <seeElement selector="{{TextOnStage.textareaPlaceholder('1')}}" stepKey="seeTextareaPlaceholder"/>
-        <!--Check min height of textarea-->
-        <comment userInput="Check min height of textarea" stepKey="comment2"/>
-        <executeJS function="return jQuery('.inline-wysiwyg-textarea').css('min-height');" stepKey="height"/>
-        <assertEquals stepKey="assertMinHeight">
-            <actualResult type="variable">height</actualResult>
-            <expectedResult type="string">{{PageBuilderTextProperty.minHeight}}</expectedResult>
-        </assertEquals>
         <actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
         <!--Verify empty content type on storefront-->
         <comment userInput="Verify empty content type on storefront" stepKey="commentVerifyEmptyBlock"/>
         <amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
         <waitForPageLoad stepKey="waitForPageLoad" />
         <seeElementInDOM selector="{{TextOnStorefront.empty('1')}}" stepKey="seeEmptyTextContentType"/>
         <dontSeeElement selector="{{TextOnStorefront.empty('1')}}" stepKey="dontSeeEmptyTextContentTypeOnStorefront"/>
-        <!--Check min height of textarea on Storefront-->
-        <comment userInput="Check min height of textarea on Storefront" stepKey="comment3"/>
         <seeElementInDOM selector="{{TextOnStorefront.noCssClasses('1')}}" stepKey="dontSeeCSSClassOnEmptyTextarea"/>
     </test>
     <test name="TextVerifyTextAreaOnTextContentType">
@@ -2640,7 +2631,8 @@
         </actionGroup>
         <!--Input text into stage-->
         <comment userInput="Input text into stage" stepKey="commentInputTextIntoStage"/>
-        <actionGroup ref="inlineEditTextWYSIWYGFromStage" stepKey="inlineEdit">
+        <actionGroup ref="inlineEditWYSIWYGFromStage" stepKey="inlineEdit">
+            <argument name="contentType" value="PageBuilderTextContentType"/>
             <argument name="content" value="{{PageBuilderTextProperty.value}}"/>
         </actionGroup>
         <executeJS function="return document.evaluate(&quot;{{TextOnStage.base('1'))}}&quot;, document.body).iterateNext().offsetHeight;" stepKey="getTextOnStageHeight"/>