Merge remote-tracking branch 'origin/MC-1420' into MC-1420

Author: danmooney2

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

@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="BlockOnStage">
-        <element name="html" type="text" selector="(//div[contains(@class,'pagebuilder-block')]//div[contains(@data-bind,'html: data.main.html')])[{{arg1}}]{{arg2}}" parameterized="true"/>
+        <element name="html" type="text" selector="(//div[contains(@class,'pagebuilder-block')]//div[contains(@data-bind,'html: data.main.html')])[{{arg1}}]//a[contains(@class,'pagebuilder-button-primary')]" parameterized="true"/>
         <element name="status" type="text" selector="(//div[contains(@class,'pagebuilder-block')]//span[contains(@class,'placeholder') and text()='{{arg}}'])" parameterized="true"/>
         <element name="deleted" type="text" selector="(//div[contains(@class,'pagebuilder-block')]//span[contains(@class,'placeholder') and contains(text(),'Block with ID: {{arg}} doesn')])" parameterized="true"/>
         <element name="title" type="text" selector="(//div[contains(@class,'pagebuilder-block')])[1]//div[contains(@class,'pagebuilder-options-wrapper')]//div[contains(@class,'option-title') and text()='{{arg}}']" parameterized="true"/>
@@ -40,7 +40,7 @@
         <element name="title" type="text" selector="(//div[contains(@class,'pagebuilder-block')]//div[contains(@class,'block-title') and text()='{{arg1}}'])" parameterized="true"/>
     </section>
     <section name="BlockOnStorefront">
-        <element name="html" type="text" selector="(//div[@data-role='block'])[{{arg1}}]{{arg2}}" parameterized="true"/>
+        <element name="html" type="text" selector="(//div[@data-role='html'])[{{arg1}}]//a[contains(@class,'pagebuilder-button-primary')]" parameterized="true"/>
         <element name="base" type="text" selector="(//div[@data-role='row']/div)[{{arg1}}]" parameterized="true"/>
         <element name="hr" type="button" selector="(//div[@data-role='row']/div)[{{arg1}}]/hr" parameterized="true"/>
         <!-- Advanced Configuration -->

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

@@ -10,8 +10,8 @@
         xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="InitialStatusBlock">
         <annotations>
-            <features value="Pagebuilder: Block"/>
-            <stories value="MC-1420: Static Block"/>
+            <features value="Pagebuilder"/>
+            <stories value="Block"/>
             <title value="Block - Initial Status"/>
             <description value="Verify that Static Block is refactor and new Block preview is applied."/>
             <severity value="CRITICAL"/>
@@ -43,8 +43,8 @@
     </test>
     <test name="AddBlockToCmsPage">
         <annotations>
-            <features value="Pagebuilder: Block"/>
-            <stories value="MC-1420: Static Block"/>
+            <features value="Pagebuilder"/>
+            <stories value="Block"/>
             <title value="Add Block to CMS Page"/>
             <description value="Verify that admin are able to add a block instance to Block Content Block and see it on frontend"/>
             <severity value="CRITICAL"/>
@@ -97,7 +97,7 @@
     <test name="BlockGetUpdated">
         <annotations>
             <features value="Pagebuilder"/>
-            <stories value="MC-1420: (Magento) Block Configuration"/>
+            <stories value="Block"/>
             <title value="Block Content Block get updated"/>
             <description value="Verify that Block Content Block get updated from Block entities"/>
             <severity value="CRITICAL"/>
@@ -151,7 +151,7 @@
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
             <argument name="contentType" value="PageBuilderHtmlContentType"/>
         </actionGroup>
-        <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterHtmlContent">
+        <actionGroup ref="fillSlideOutPanelTextArea" stepKey="enterHtmlContent">
             <argument name="property" value="PageBuilderHtmlPropertyButton"/>
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
@@ -163,22 +163,23 @@
         <comment userInput="Validate stage after updating block" stepKey="validateStage2" />
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
         <waitForElementVisible selector="{{HtmlOnStage.base('1')}}" stepKey="waitForHtmlBaseStage1"/>
-        <waitForElementVisible selector="{{BlockOnStage.html('1', PageBuilderHtmlPropertyButton.selector)}}" stepKey="waitForHtmlStage1"/>
+        <waitForElementVisible selector="{{BlockOnStage.html('1')}}" stepKey="waitForHtmlStage1"/>
         <actionGroup ref="ClearCacheActionGroup" stepKey="clearMagentoCache"/>
         <!-- Validate Storefront -->
         <comment userInput="Validate storefront after updating block" stepKey="validateStorefront2" />
         <amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
         <waitForElementVisible selector="{{HtmlOnStorefront.base('1')}}" stepKey="waitForHtmlBaseStorefront"/>
-        <waitForElementVisible selector="{{HtmlOnStorefront.html('1', PageBuilderHtmlPropertyButton.selector)}}" stepKey="waitForHtmlStorefront"/>
+        <waitForElementVisible selector="{{BlockOnStorefront.html('1')}}" stepKey="waitForHtmlStorefront"/>
     </test>
     <test name="VerifyBlockDisabled">
         <annotations>
-            <features value="Pagebuilder: Block"/>
-            <stories value="MC-1420: Static Block"/>
+            <features value="Pagebuilder"/>
+            <stories value="Block"/>
             <title value="Block - Verify disabled block does not show on the stage or on storefront" />
             <description value="Verify that disabled block instance is not rendered on the stage or on the storefront" />
             <severity value="CRITICAL" />
             <testCaseId value="MC-2288" />
+            <useCaseId value="MC-1420"/>
             <group value="pagebuilder" />
             <group value="pagebuilder-block" />
         </annotations>
@@ -234,11 +235,12 @@
     <test name="BlockDelete">
         <annotations>
             <features value="Pagebuilder"/>
-            <stories value="MAGETWO-83941: Static Block"/>
+            <stories value="Block"/>
             <title value="Block - Delete Block"/>
             <description value="A user should be able to delete an Block content type. Verify on Stage amd Storefront."/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-2848"/>
+            <useCaseId value="MC-1420"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-block"/>
             <group value="pagebuilder-customBeforeAfter"/>
@@ -272,7 +274,7 @@
     <test name="DisplayingDeletedBlockOnStage">
         <annotations>
             <features value="Pagebuilder"/>
-            <stories value="Static Block"/>
+            <stories value="Block"/>
             <title value="Block - Displaying deleted block on Stage"/>
             <description value="A user should be able to see that block is deleted on Stage."/>
             <severity value="CRITICAL"/>

dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/registration.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 use Magento\Framework\Component\ComponentRegistrar;