Merge remote-tracking branch 'owls/PB-107' into PB-107

Author: cspruiell

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

@@ -44,7 +44,7 @@
         <seeElement selector="{{page.productNameInCarouselNotClonedBySlick(productGroupIndex, product.name)}}" stepKey="seeProduct"/>
     </actionGroup>
     <actionGroup name="validateCannotSeeProductInDefaultProductCarousel" extends="validateCanSeeProductInDefaultProductCarousel">
-        <waitForElement selector="{{page.productNameInCarouselNotClonedBySlick(productGroupIndex, product.name)}}" stepKey="waitForProduct"/>
+        <waitForElementNotVisible selector="{{page.productNameInCarouselNotClonedBySlick(productGroupIndex, product.name)}}" stepKey="waitForProduct"/>
         <dontSeeElement selector="{{page.productNameInCarouselNotClonedBySlick(productGroupIndex, product.name)}}" stepKey="seeProduct"/>
     </actionGroup>
     <actionGroup name="validateCanSeeProductInContinuousProductCarousel">
@@ -58,7 +58,7 @@
         <seeElement selector="{{page.productNameInCarouselBySlickSlideIndex(productGroupIndex, productItemIndex, product.name)}}" stepKey="seeProduct"/>
     </actionGroup>
     <actionGroup name="validateCannotSeeProductInContinuousProductCarousel" extends="validateCanSeeProductInContinuousProductCarousel">
-        <waitForElement selector="{{page.productNameInCarouselBySlickSlideIndex(productGroupIndex, productItemIndex, product.name)}}" stepKey="waitForProduct"/>
+        <waitForElementNotVisible selector="{{page.productNameInCarouselBySlickSlideIndex(productGroupIndex, productItemIndex, product.name)}}" stepKey="waitForProduct"/>
         <dontSeeElement selector="{{page.productNameInCarouselBySlickSlideIndex(productGroupIndex, productItemIndex, product.name)}}" stepKey="seeProduct"/>
     </actionGroup>
     <actionGroup name="validateProductInProducts">
@@ -489,10 +489,10 @@
     </actionGroup>
     <actionGroup name="validateProductTotals">
         <arguments>
-            <argument name="property"/>
+            <argument name="productsTotals" defaultValue="of 1 (0 disabled)" type="string"/>
         </arguments>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
-        <see selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" userInput="{{property.value}}" stepKey="seeProductTotals"/>
+        <waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(PageBuilderProductsTotalProductsProperty.section, PageBuilderProductsTotalProductsProperty.fieldName)}}" stepKey="waitForFieldVisible"/>
+        <see selector="{{EditPanelForm.panelFieldControl(PageBuilderProductsTotalProductsProperty.section, PageBuilderProductsTotalProductsProperty.fieldName)}}" userInput="{{productsTotals}}" stepKey="seeProductTotals"/>
     </actionGroup>
 </actionGroups>

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

@@ -162,21 +162,6 @@
         <data key="value"/>
         <data key="errorMessage">This is a required field.</data>
     </entity>
-    <entity name="PageBuilderTotalProductsPropertyThree" type="pagebuilder_products_grid_total_products">
-        <data key="section">appearance_fieldset</data>
-        <data key="fieldName">product_totals</data>
-        <data key="value">of 3 (0 disabled)</data>
-    </entity>
-    <entity name="PageBuilderTotalProductsPropertyOne" type="pagebuilder_products_grid_total_products">
-        <data key="section">appearance_fieldset</data>
-        <data key="fieldName">product_totals</data>
-        <data key="value">of 1 (0 disabled)</data>
-    </entity>
-    <entity name="PageBuilderTotalProductsPropertyTwoOneDisabled" type="pagebuilder_products_grid_total_products">
-        <data key="section">appearance_fieldset</data>
-        <data key="fieldName">product_totals</data>
-        <data key="value">of 2 (1 disabled)</data>
-    </entity>
     <!-- Number of Products to Display: Carousel Appearance -->
     <entity name="PageBuilderProductsCarouselCountPropertyOne" type="pagebuilder_products_carousel_number_of_products">
         <data key="name">Number of Products to Display</data>
@@ -248,6 +233,11 @@
         <data key="value"/>
         <data key="errorMessage">This is a required field.</data>
     </entity>
+    <!-- Total Products -->
+    <entity name="PageBuilderProductsTotalProductsProperty" type="pagebuilder_products_grid_total_products">
+        <data key="section">appearance_fieldset</data>
+        <data key="fieldName">product_totals</data>
+    </entity>
     <!-- Carousel Settings: Carousel Mode -->
     <entity name="PageBuilderProductsCarouselSettingsCarouselMode_Default" type="pagebuilder_products_carousel_mode">
         <data key="name">Autoplay</data>