Merge remote-tracking branch 'remotes/origin/1.1-develop' into MC-18709

VeronikaYarats · VeronikaYarats · commit e09afc186ff7 · 2019-10-04T15:23:24.000+03:00
diff --git a/app/code/Magento/PageBuilder/Controller/Adminhtml/Stage/Preview.php b/app/code/Magento/PageBuilder/Controller/Adminhtml/Stage/Preview.php
@@ -13,8 +13,6 @@
 
 /**
  * Preview controller to render blocks preview on Stage
- *
- * @api
  */
 class Preview extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTests.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTests.xml
@@ -12,7 +12,7 @@
             <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="loginGetFromGeneralFile"/>
         </before>
         <after>
-            <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" before="amOnLogoutPage"/>
+            <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" before="adminLogout"/>
         </after>
     </test>
      <test name="AdminAddImageToCMSPageTinyMCE3Test">

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* Preview controller to render blocks preview on Stage`
`16`		`- *`
`17`		`- * @api`
`18`	`16`	`*/`
`19`	`17`	`class Preview extends \Magento\Backend\App\Action implements HttpPostActionInterface`
`20`	`18`	`{`