Merge remote-tracking branch 'origin/MC-3448-readhtmlwithimage-test' into cms-team-1-delivery

Author: cspruiell

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

@@ -12,7 +12,7 @@
         <data key="content">&lt;div class=&quot;my-div&quot;&gt;&lt;/div&gt;</data>
     </entity>
     <entity name="cmsPageWithImage" type="cms_page">
-        <data key="content">&lt;img src=&quot;{{media url=&quot;wysiwyg/home/home-t-shirts.png&quot;}}&quot;/&gt;</data>
+        <data key="content">&lt;img src=&quot;{{media url='wysiwyg/home/home-t-shirts.png'}}&quot;/&gt;</data>
     </entity>
     <entity name="cmsPageNonexistentDataRole" type="cms_page">
         <data key="content">&lt;div data-role=&quot;row&quot;&gt;&lt;div data-role=&quot;non-existent-content-type&quot;&gt;&lt;/div&gt;&lt;/div&gt;</data>

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

@@ -48,7 +48,7 @@
         <element name="content" type="button" selector="//div[contains(@class, 'pagebuilder-html')][1]//div[contains(text(), '&lt;div class=&quot;my-div&quot;&gt;&lt;/div&gt;')]"/>
     </section>
     <section name="HtmlOnBackendWithImage">
-        <element name="content" type="button" selector="//div[contains(@class, 'pagebuilder-html')][1]/img[not(contains(@src, '{{media'))]"/>
+        <element name="content" type="button" selector="//div[contains(@class, 'pagebuilder-html')][1]/div[contains(@class, 'placeholder-html-code') and contains(text(), '{{media')]"/>
     </section>
     <section name="HtmlOnFrontendWithImage">
         <element name="content" type="button" selector="//div[@data-role='html'][1]/img[not(contains(@src, '{{media'))]"/>

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

@@ -161,9 +161,6 @@
             <group value="pagebuilder-html"/>
             <group value="pagebuilder-wysiwygConversion"/>
             <group value="pagebuilder-customBeforeAfter"/>
-            <skip>
-                <issueId value="MC-3448"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -192,8 +189,6 @@
         <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToContentCreatedCMSPage2">
             <argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
         </actionGroup>
-        <waitForElement time="5" selector="{{CmsNewPagePageContentSection.header}}" stepKey="waitForElement" />
-        <waitForElementVisible time="5" selector="{{CmsNewPagePageContentSection.header}}" stepKey="waitForHeaderVisible" />
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
         <waitForElementVisible time="1" selector="{{PageBuilderStage.contentTypeInStage('html')}}" stepKey="waitForContentTypeInStage" />
         <seeElement selector="{{PageBuilderStage.contentTypeInStage('html')}}" stepKey="seeContentTypeInStage"/>