Merge remote-tracking branch 'origin/MC-5790-remove-reset-button' into cms-team-1-delivery

Hwashiang Yu · Hwashiang Yu · commit 7af1105d169a · 2018-12-05T12:16:35.000-06:00
diff --git a/app/code/Magento/PageBuilder/Block/Adminhtml/ContentType/Edit/ResetButton.php b/app/code/Magento/PageBuilder/Block/Adminhtml/ContentType/Edit/ResetButton.php
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest.xml
@@ -1844,4 +1844,30 @@
             <argument name="section" value="ButtonItemOnStorefront"/>
         </actionGroup>
     </test>
+    <test name="EditFormModalNoResetButton">
+        <annotations>
+            <features value="PageBuilder"/>
+            <stories value="Common Tests"/>
+            <title value="Content Types edit form modal should not have reset button"/>
+            <description value="If user opens edit form modal, they should not see reset button"/>
+            <severity value="MAJOR"/>
+            <useCaseId value="MC-5790"/>
+            <testCaseId value="MC-5791"/>
+            <group value="pagebuilder"/>
+            <group value="pagebuilder-row"/>
+            <group value="pagebuilder-common"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
+            <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
+            <argument name="contentType" value="PageBuilderRowContentType"/>
+        </actionGroup>
+        <dontSeeElementInDOM selector="{{EditPanelForm.editFormReset}}" stepKey="dontSeeInDOMResetButton"/>
+    </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_base_form.xml b/app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_base_form.xml
@@ -14,7 +14,6 @@
         <namespace>pagebuilder_base_form</namespace>
         <buttons>
             <button name="save" class="Magento\PageBuilder\Block\Adminhtml\ContentType\Edit\SaveButton"/>
-            <button name="reset" class="Magento\PageBuilder\Block\Adminhtml\ContentType\Edit\ResetButton"/>
             <button name="close" class="Magento\PageBuilder\Block\Adminhtml\ContentType\Edit\ModalCloseButton"/>
         </buttons>
     </settings>
