Merge branch 'hackathon' of github.com:magento-obsessive-owls/magento2-page-builder into hackathon

Author: davemacaulay

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

@@ -218,12 +218,12 @@
         <annotations>
             <description>Closes the confirmation modal on the Page Builder stage.</description>
         </annotations>
-        <waitForElementVisible time="10" selector="{{PageBuilderStage.modal}}" stepKey="waitForModal"/>
-        <seeElement selector="{{PageBuilderStage.modal}}" stepKey="seeRemovalModal"/>
-        <waitForElementVisible time="10" selector="{{PageBuilderStage.modalCancel}}" stepKey="waitForModalCancel"/>
-        <click selector="{{PageBuilderStage.modalCancel}}" stepKey="clickCloseModal"/>
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
-        <waitForElementNotVisible time="1" selector="{{PageBuilderStage.modal}}" stepKey="waitForModalHide"/>
+        <waitForElementVisible time="10" selector="{{PageBuilderStage.modal}}" stepKey="waitForModalVisible"/>
+        <seeElement selector="{{PageBuilderStage.modal}}" stepKey="seeModal"/>
+        <waitForElementVisible time="10" selector="{{PageBuilderStage.modalCancel}}" stepKey="waitForModalCancelButton"/>
+        <click selector="{{PageBuilderStage.modalCancel}}" stepKey="clickCancelButton"/>
+        <waitForPageLoad stepKey="waitForModalClose"/>
+        <waitForElementNotVisible time="1" selector="{{PageBuilderStage.modal}}" stepKey="waitForModalNotVisible"/>
     </actionGroup>
     <actionGroup name="validateOnHoverOptionMenu">
         <arguments>

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

@@ -182,6 +182,7 @@
             <argument name="pageBuilderArea" defaultValue="" type="string"/>
         </arguments>
         <waitForPageLoad stepKey="waitForStageLoad"/>
+        <waitForElementVisible selector="{{RowOnStage.empty(rowIndex)}}" stepKey="waitForEmptyRow"/>
         <seeElement selector="{{RowOnStage.empty(rowIndex)}}" stepKey="seeEmptyRow"/>
         <seeNumberOfElements userInput="1" selector="{{pageBuilderArea}}{{RowOnStage.allRows}}" stepKey="seeOnlyOneRow"/>
     </actionGroup>

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

@@ -9,21 +9,21 @@
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <!-- Template Name -->
-    <entity name="PageBuilderTemplateNameRandom" type="pagebuilder_template_name_property">
+    <entity name="PageBuilderTemplateNameRandom" type="pagebuilder_template_name">
         <data key="name" unique="suffix">MFTF Template</data>
     </entity>
-    <entity name="PageBuilderTemplateNameRandom2" type="pagebuilder_template_name_property">
+    <entity name="PageBuilderTemplateNameRandom2" type="pagebuilder_template_name">
         <data key="name" unique="suffix">MFTF Second Template</data>
     </entity>
-    <entity name="PageBuilderTemplateName_Sorting" type="pagebuilder_template_name_property">
+    <entity name="PageBuilderTemplateName_Sorting" type="pagebuilder_template_name_sort">
         <data key="0">sorting_0</data>
         <data key="999">sorting_999</data>
         <data key="aaa">sorting_aaa</data>
         <data key="A">sorting_A</data>
         <data key="zzz">sorting_zzz</data>
         <data key="Z">sorting_Z</data>
     </entity>
-    <entity name="PageBuilderTemplateName_EdgeCases" type="pagebuilder_template_name_property">
+    <entity name="PageBuilderTemplateName_EdgeCases" type="pagebuilder_template_name_edge_case">
         <data key="empty"/>
         <data key="leadingSpace"> leadingSpaceTest</data>
         <data key="noLeadingSpace">leadingSpaceTest</data>
@@ -32,7 +32,7 @@
         <data key="specialCharacters">./;[]\-=&lt;&gt;?:"{}|_+!@#$%^&amp;*()`~Ω≈ç√∫˜µ≤≥÷åß∂ƒ©˙∆˚¬…æœ∑´®†¥¨ˆøπ“‘¡™£¢∞§¶•ªº–≠¸˛Ç◊ı˜Â¯˘¿ÅÍÎÏ˝ÓÔÒÚÆ☃Œ„´‰ˇÁ¨ˆØ∏”’`⁄€‹›fifl‡°·‚—±⅛⅜⅝⅞ЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя٠١٢٣٤٥٦٧٨٩ヽ</data>
     </entity>
     <!-- Template Created For -->
-    <entity name="PageBuilderTemplateCreatedFor" type="pagebuilder_template_created_for_property">
+    <entity name="PageBuilderTemplateCreatedFor" type="pagebuilder_template_created_for">
         <data key="any">Any</data>
         <data key="page">Page</data>
         <data key="product">Product</data>
@@ -41,7 +41,7 @@
         <data key="dynamicBlock">Dynamic Block</data>
     </entity>
     <!-- Template Grid -->
-    <entity name="PageBuilderTemplateGridColumns" type="pagebuilder_template_grid_property">
+    <entity name="PageBuilderTemplateGridColumns" type="pagebuilder_template_grid_column_header">
         <data key="id">ID</data>
         <data key="previewImage">Preview Image</data>
         <data key="templateName">Template Name</data>

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

@@ -82,7 +82,4 @@
         <element name="contentTypeRemoveByIndex" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-{{arg1}}")])[{{arg2}}]//div[contains(@class,"pagebuilder-options-visible")]//a[@title="Remove"]' parameterized="true"/>
         <element name="contentTypeRemoveDisabled" type="button" selector='.pagebuilder-options .remove-structural[title="Remove"].disabled'/>
     </section>
-    <section name="AdminContentSection">
-        <element name="container" type="text" selector="#container" timeout="10"/>
-    </section>
 </sections>