Merge branch 'MAGETWO-86953-drag-and-drop' of github.com:magento-obsessive-owls/magento2-page-builder into MAGETWO-86953-drag-and-drop

Author: davemacaulay

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

@@ -225,15 +225,14 @@
         </actionGroup>
         <!-- Update Edit Panel -->
         <comment userInput="Update Edit Panel" stepKey="commentEdit"/>
+        <actionGroup ref="clickAddLocationButton" stepKey="clickAddLocationButton"/>
         <actionGroup ref="clickMapToAddOrMovePin" stepKey="addMapPin"/>
         <!-- Add Fill Required Fields -->
         <comment userInput="Add Fill Required Fields" stepKey="commentAddFillRequiredFields"/>
         <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterLocationName">
             <argument name="property" value="PageBuilderMapLocationName_TestLocation"/>
         </actionGroup>
-        <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterHeight">
-            <argument name="property" value="PageBuilderMapHeightProperty500px"/>
-        </actionGroup>
+        <actionGroup ref="saveLocationForm" stepKey="saveLocationForm"/>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
         <!-- Validate Stage -->
         <comment userInput="User sees map displayed in column on Stage" stepKey="confirmMapOnStage"/>
@@ -245,7 +244,7 @@
         </actionGroup>
         <actionGroup ref="validateMapSettings" stepKey="validateMapStage">
             <argument name="page" value="MapOnStage"/>
-            <argument name="height" value="PageBuilderMapHeightProperty500px"/>
+            <argument name="height" value="PageBuilderMapHeightDefaultProperty"/>
         </actionGroup>
         <actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
         <comment userInput="View Map inside column on storefront" stepKey="viewMapOnStorefront"/>
@@ -260,7 +259,7 @@
         </actionGroup>
         <actionGroup ref="validateMapSettings" stepKey="validateMapStoreFront">
             <argument name="page" value="MapOnStorefront"/>
-            <argument name="height" value="PageBuilderMapHeightProperty500px"/>
+            <argument name="height" value="PageBuilderMapHeightDefaultProperty"/>
         </actionGroup>
     </test>
     <test name="ColumnsMoveContentBetweenColumns">