MC-3091: Improve MFTF tests for Block Configuration

Author: kieuphan2406

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

@@ -26,11 +26,10 @@
     </actionGroup>
     <actionGroup name="verifyBlockOnStage">
         <arguments>
-            <argument name="contentType"/>
             <argument name="block"/>
             <argument name="index"/>
         </arguments>
-        <moveMouseOver selector="{{PageBuilderStage.contentTypeInStage(contentType.role)}}" stepKey="onMouseOverContentTypeStage"/>
+        <moveMouseOver selector="{{PageBuilderStage.contentTypeInStage(PageBuilderBlockContentType.role)}}" stepKey="onMouseOverContentTypeStage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForElementVisible selector="{{BlockOnStage.title('1', block.title)}}" stepKey="wait"/>
         <seeElement selector="{{BlockOnStage.title('1',block.title)}}" stepKey="seeOptionMenuTitle"/>

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

@@ -88,14 +88,12 @@
         <seeElement selector="{{BlockOnForm.title('$$createPreReqBlock.title$$')}}" stepKey="seeBlockTitleOnForm"/>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
         <actionGroup ref="verifyBlockOnStage" stepKey="verifyBlockOnStage">
-            <argument name="contentType" value="PageBuilderBlockContentType"/>
             <argument name="block" value="$$createPreReqBlock$$"/>
             <argument name="index" value="1"/>
         </actionGroup>
         <actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
         <actionGroup ref="verifyBlockOnStage" stepKey="verifyBlockOnStageAfterSave">
-            <argument name="contentType" value="PageBuilderBlockContentType"/>
             <argument name="block" value="$$createPreReqBlock$$"/>
             <argument name="index" value="1"/>
         </actionGroup>
@@ -145,7 +143,6 @@
         <!-- Validate Stage -->
         <comment userInput="Validate stage" stepKey="validateStage1" />
         <actionGroup ref="verifyBlockOnStage" stepKey="verifyBlockOnStage">
-            <argument name="contentType" value="PageBuilderBlockContentType"/>
             <argument name="block" value="$$createPreReqBlock$$"/>
             <argument name="index" value="1"/>
         </actionGroup>