#429: User can add content to the Stage directly

petrovsa · petrovsa · commit c9ecfcada461 · 2020-11-17T09:14:55.000+02:00
- made changes in PageBuilderCMSPageAddContentDirectlyToStageTest
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnBackendSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnBackendSection.xml
@@ -7,6 +7,7 @@
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="BannerOnBackend">
+        <element name="allBanners" type="button" selector="[data-content-type='banner']"/>
         <element name="base" type="button" selector="(//div[contains(@class,&quot;pagebuilder-banner&quot;) and contains(@class,&quot;pagebuilder-content-type&quot;)])[{{bannerIndex}}]" parameterized="true"/>
         <element name="baseCSS" type="button" selector=".pagebuilder-banner.pagebuilder-content-type"/>
         <element name="hidden" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{bannerIndex}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and contains(@class, 'pagebuilder-content-type-hidden')]" parameterized="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnFrontendSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnFrontendSection.xml
@@ -7,6 +7,7 @@
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="BannerOnFrontend">
+        <element name="allBanners" type="button" selector="[data-content-type='banner']"/>
         <element name="base" type="button" selector="(//div[@data-content-type=&quot;banner&quot;])[{{bannerIndex}}]" parameterized="true"/>
         <element name="baseCSS" type="button" selector="[data-content-type=banner]"/>
         <element name="baseJS" type="button" selector="document.querySelectorAll('[data-content-type=banner] div.pagebuilder-banner-wrapper')[{{wrapperIndex}} - 1]" parameterized="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonGroupOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonGroupOnStageSection.xml
@@ -8,6 +8,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ButtonGroupOnStage">
+        <element name="allButtons" type="text" selector="[data-content-type='buttons']"/>
         <element name="jsButtonGroupSelector" type="text" selector="document.querySelectorAll('.pagebuilder-buttons')[{{arg1}}-1]" parameterized="true"/>
         <element name="base" type="button" selector="(//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]" parameterized="true"/>
         <element name="hidden" type="button" selector="(//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and contains(@class, 'pagebuilder-content-type-hidden')]" parameterized="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonGroupOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonGroupOnStorefrontSection.xml
@@ -8,6 +8,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ButtonGroupOnStorefront">
+        <element name="allButtons" type="text" selector="[data-content-type='buttons']"/>
         <element name="jsButtonGroupSelector" type="text" selector="document.querySelectorAll('div[data-content-type=\'buttons\']')[{{arg1}}-1]" parameterized="true"/>
         <element name="base" type="button" selector="(//div[@data-content-type='buttons'])[{{arg1}}]" parameterized="true"/>
         <element name="hidden" type="button" selector="(//div[@data-content-type='buttons'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHeadingSection/HeadingOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHeadingSection/HeadingOnStorefrontSection.xml
@@ -7,6 +7,7 @@
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="HeadingOnStorefront">
+        <element name="all" type="text" selector="[data-content-type='heading']"/>
         <element name="base" type="text" selector="(//*[@data-content-type='heading'])[{{arg2}}]" parameterized="true"/>
         <element name="baseByTagName" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}]" parameterized="true"/>
         <element name="baseJs" type="text" selector="document.querySelectorAll('[data-content-type=\'heading\']')[{{arg1}}]" parameterized="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStageSection.xml
@@ -8,6 +8,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ImageOnStage">
+        <element name="allImages" type="text" selector="[data-content-type='image']"/>
         <element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]" parameterized="true"/>
         <element name="imageSourceByIndex" type="text" selector="(//figure[@data-content-type='image'])[{{arg1}}]//img[contains(@src,'{{arg2}}')]" parameterized="true"/>
         <element name="imageCaption" type="text" selector="(//figure[@data-content-type='image'])[{{arg1}}]//figcaption[@data-element='caption']" parameterized="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStorefrontSection.xml
@@ -8,6 +8,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ImageOnStorefront">
+        <element name="allImages" type="text" selector="[data-content-type='image']"/>
         <element name="base" type="text" selector="(//figure[@data-content-type='image'])[{{arg1}}]" parameterized="true"/>
         <element name="hidden" type="text" selector="(//figure[@data-content-type='image'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>
         <element name="notHidden" type="text" selector="(//figure[@data-content-type='image'])[{{arg1}}][not(contains(@style, 'display: none'))]" parameterized="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/MapOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/MapOnStageSection.xml
@@ -8,6 +8,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="MapOnStage">
+        <element name="allMaps" type="text" selector="[data-content-type='map']"/>
         <element name="base" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]" parameterized="true"/>
         <element name="baseCSS" type="button" selector="[data-content-type=map]"/>
         <element name="mainCSS" type="button" selector="[data-content-type=map][data-element=main]"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/MapOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/MapOnStorefrontSection.xml
@@ -8,6 +8,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="MapOnStorefront">
+        <element name="allMaps" type="text" selector="[data-content-type='map']"/>
         <element name="emptyMap" type="button" selector="(//div[@data-content-type='map'])[{{arg1}}][not(@src) and contains(@style,'display: none;')]" parameterized="true"/>
         <element name="base" type="button" selector="(//div[@data-content-type='map'])[{{arg1}}]" parameterized="true"/>
         <element name="baseCSS" type="button" selector="[data-content-type=map][data-element=main]"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsOnStageSection.xml
@@ -8,6 +8,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ProductsOnStage">
+        <element name="allProducts" type="text" selector="[data-content-type='products']"/>
         <element name="base" type="text" parameterized="true" selector="(//div[contains(@class,'pagebuilder-products')]//div[contains(@data-appearance,'grid')])[{{indexOfProductGroup}}]"/>
         <element name="price" type="text" selector="//div[contains(@class,'pagebuilder-products')]//div[contains(@data-appearance,'grid')]//div[contains(@data-role,'priceBox')]"/>
         <element name="hidden" type="text" parameterized="true" selector="(//div[contains(@class,'pagebuilder-products')]//div[contains(@data-appearance,'grid')])[{{indexOfProductGroup}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and contains(@class, 'pagebuilder-content-type-hidden')]"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsOnStorefrontSection.xml
@@ -8,6 +8,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ProductsOnStorefront">
+        <element name="allProducts" type="text" selector="[data-content-type='products']"/>
         <element name="base" type="text" parameterized="true" selector="(//div[contains(@data-content-type,'products')])[{{indexOfProductGroup}}]"/>
         <element name="price" type="text" selector="//div[contains(@data-content-type,'products')]//div[contains(@data-role,'priceBox')]"/>
         <element name="hidden" type="text" parameterized="true" selector="(//div[contains(@data-content-type,'products')])[{{indexOfProductGroup}}][contains(@style, 'display: none')]"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnStageSection.xml
@@ -8,6 +8,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="TextOnStage">
+        <element name="allText" type="text" selector="[data-content-type='text']"/>
         <element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div" parameterized="true"/>
         <element name="textAreaText" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[.='{{arg2}}']" parameterized="true"/>
         <element name="hidden" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and contains(@class, 'pagebuilder-content-type-hidden')]" parameterized="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnStorefrontSection.xml
@@ -8,6 +8,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="TextOnStorefront">
+        <element name="allText" type="text" selector="[data-content-type='text']"/>
         <element name="base" type="text" selector="(//div[@data-content-type=&quot;text&quot;])[{{arg1}}]" parameterized="true"/>
         <element name="hidden" type="text" selector="(//div[@data-content-type='text'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>
         <element name="notHidden" type="text" selector="(//div[@data-content-type='text'])[{{arg1}}][not(contains(@style, 'display: none'))]" parameterized="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderVideoSection/VideoOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderVideoSection/VideoOnStageSection.xml
@@ -8,6 +8,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="VideoOnStage">
+        <element name="allVideo" type="text" selector="[data-content-type='video']"/>
         <element name="mainCSS" type="text" selector="[data-content-type=video][data-element=main]"/>
         <element name="wrapperCSS" type="text" selector="[data-content-type=video] [data-element=wrapper]"/>
         <element name="main" type="text" selector="(//div[@data-content-type=&quot;video&quot;])[{{arg1}}]" parameterized="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderVideoSection/VideoOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderVideoSection/VideoOnStorefrontSection.xml
@@ -8,6 +8,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="VideoOnStorefront">
+        <element name="allVideo" type="text" selector="[data-content-type='video']"/>
         <element name="mainCSS" type="text" selector="[data-content-type=video][data-element=main]"/>
         <element name="wrapperCSS" type="text" selector="[data-content-type=video] [data-element=wrapper]"/>
         <element name="main" type="text" selector="(//div[@data-content-type=&quot;video&quot;])[{{arg1}}]" parameterized="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageAddContentDirectlyToStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageAddContentDirectlyToStageTest.xml
@@ -73,7 +73,7 @@
             <argument name="contentType" value="PageBuilderDividerContentType"/>
             <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
         </actionGroup>
-        <!-- Verify Cannot HTML Code to Stage Directly -->
+        <!-- Verify Cannot Add HTML Code to Stage Directly -->
         <actionGroup ref="dragContentTypeToContainer" stepKey="dragHTMLIntoContainer">
             <argument name="contentType" value="PageBuilderHtmlContentType"/>
             <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
@@ -136,16 +136,16 @@
             <expectedResult type="int">1</expectedResult>
             <actualResult type="variable">numberOfBlockContentTypesStageAfterSave</actualResult>
         </assertEquals>
-        <dontSeeElementInDOM selector="{{TextOnStage.base('1')}}" stepKey="dontSeeTextAfterSave"/>
-        <dontSeeElementInDOM selector="{{HeadingOnStage.base('1')}}" stepKey="dontSeeHeadingAfterSave"/>
-        <dontSeeElementInDOM selector="{{ButtonGroupOnStage.base('1')}}" stepKey="dontSeeButtonGroupAfterSave"/>
+        <dontSeeElementInDOM selector="{{TextOnStage.allText}}" stepKey="dontSeeTextAfterSave"/>
+        <dontSeeElementInDOM selector="{{HeadingOnStage.all}}" stepKey="dontSeeHeadingAfterSave"/>
+        <dontSeeElementInDOM selector="{{ButtonGroupOnStage.allButtons}}" stepKey="dontSeeButtonGroupAfterSave"/>
         <dontSeeElementInDOM selector="{{DividerOnStage.allDividers}}" stepKey="dontSeeDividerAfterSave"/>
-        <dontSeeElementInDOM selector="{{VideoOnStage.base('1')}}" stepKey="dontSeeVideoAfterSave"/>
-        <dontSeeElementInDOM selector="{{ImageOnStage.base('1')}}" stepKey="dontSeeImageAfterSave"/>
-        <dontSeeElementInDOM selector="{{MapOnStage.base('1')}}" stepKey="dontSeeMapAfterSave"/>
+        <dontSeeElementInDOM selector="{{VideoOnStage.allVideo}}" stepKey="dontSeeVideoAfterSave"/>
+        <dontSeeElementInDOM selector="{{ImageOnStage.allImages}}" stepKey="dontSeeImageAfterSave"/>
+        <dontSeeElementInDOM selector="{{MapOnStage.allMaps}}" stepKey="dontSeeMapAfterSave"/>
         <dontSeeElementInDOM selector="{{SliderOnStage.all}}" stepKey="dontSeeSliderAfterSave"/>
-        <dontSeeElementInDOM selector="{{BannerOnBackend.base('1')}}" stepKey="dontSeeBannerAfterSave"/>
-        <dontSeeElementInDOM selector="{{ProductsOnStage.base('1')}}" stepKey="dontSeeProductsAfterSave"/>
+        <dontSeeElementInDOM selector="{{BannerOnBackend.allBanners}}" stepKey="dontSeeBannerAfterSave"/>
+        <dontSeeElementInDOM selector="{{ProductsOnStage.allProducts}}" stepKey="dontSeeProductsAfterSave"/>
         <!-- Verify Expected Content Types on Storefront -->
         <actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront4">
             <argument name="page" value="$$createCMSPage.identifier$$"/>
@@ -163,15 +163,15 @@
             <expectedResult type="int">1</expectedResult>
             <actualResult type="variable">numberOfBlockContentTypesStorefront</actualResult>
         </assertEquals>
-        <dontSeeElementInDOM selector="{{TextOnStorefront.base('1')}}" stepKey="dontSeeTextStorefront"/>
-        <dontSeeElementInDOM selector="{{HeadingOnStorefront.base('1')}}" stepKey="dontSeeHeadingStorefront"/>
-        <dontSeeElementInDOM selector="{{ButtonGroupOnStorefront.base('1')}}" stepKey="dontSeeButtonGroupStorefront"/>
-        <dontSeeElementInDOM selector="{{DividerOnStorefront.base('1')}}" stepKey="dontSeeDividerStorefront"/>
-        <dontSeeElementInDOM selector="{{VideoOnStorefront.base('1')}}" stepKey="dontSeeVideoStorefront"/>
-        <dontSeeElementInDOM selector="{{ImageOnStorefront.imageDisplay}}" stepKey="notSeeImageOnStorefront"/>
-        <dontSeeElementInDOM selector="{{MapOnStorefront.base('1')}}" stepKey="dontSeeMapStorefront"/>
-        <dontSeeElementInDOM selector="{{SlideOnFrontend.base('1')}}" stepKey="dontSeeSliderOnFrontend"/>
-        <dontSeeElementInDOM selector="{{BannerOnFrontend.base('1')}}" stepKey="dontSeeBannerStorefront"/>
-        <dontSeeElementInDOM selector="{{ProductsOnStorefront.base('1')}}" stepKey="dontSeeProductsStorefront"/>
+        <dontSeeElementInDOM selector="{{TextOnStorefront.allText}}" stepKey="dontSeeTextStorefront"/>
+        <dontSeeElementInDOM selector="{{HeadingOnStorefront.all}}" stepKey="dontSeeHeadingStorefront"/>
+        <dontSeeElementInDOM selector="{{ButtonGroupOnStorefront.allButtons}}" stepKey="dontSeeButtonGroupStorefront"/>
+        <dontSeeElementInDOM selector="{{DividerOnStorefront.allDividers}}" stepKey="dontSeeDividerStorefront"/>
+        <dontSeeElementInDOM selector="{{VideoOnStorefront.allVideo}}" stepKey="dontSeeVideoStorefront"/>
+        <dontSeeElementInDOM selector="{{ImageOnStorefront.allImages}}" stepKey="notSeeImageOnStorefront"/>
+        <dontSeeElementInDOM selector="{{MapOnStorefront.allMaps}}" stepKey="dontSeeMapStorefront"/>
+        <dontSeeElementInDOM selector="{{SlideOnFrontend.all}}" stepKey="dontSeeSliderOnFrontend"/>
+        <dontSeeElementInDOM selector="{{BannerOnFrontend.allBanners}}" stepKey="dontSeeBannerStorefront"/>
+        <dontSeeElementInDOM selector="{{ProductsOnStorefront.allProducts}}" stepKey="dontSeeProductsStorefront"/>
     </test>
 </tests>
