Pb 518

app/code/Magento/CatalogPageBuilderAnalytics/composer.json

@@ -6,8 +6,8 @@
     },
     "require": {
         "magento/module-page-builder-analytics": "*",
-        "magento/module-catalog": "~103.0.5",
-        "magento/framework": "~102.0.5",
+        "magento/module-catalog": "*",
+        "magento/framework": "*",
         "php": "~7.1.3||~7.2.0||~7.3.0"
     },
     "type": "magento2-module",

app/code/Magento/CmsPageBuilderAnalytics/composer.json

@@ -7,7 +7,7 @@
     "require": {
         "magento/module-page-builder-analytics": "*",
         "magento/module-cms": "*",
-        "magento/framework": "~102.0.5",
+        "magento/framework": "*",
         "php": "~7.1.3||~7.2.0||~7.3.0"
     },
     "type": "magento2-module",

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminDisableWYSIWYGActionGroup">
+        <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
+    </actionGroup>
+</actionGroups>

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminEnableWYSIWYGActionGroup">
+        <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/PageBuilder/composer.json

@@ -2,20 +2,20 @@
     "name": "magento/module-page-builder",
     "description": "Page Builder module",
     "require": {
-        "magento/framework": "~102.0.5",
+        "magento/framework": "*",
         "magento/module-eav": "*",
-        "magento/module-store": "~101.0.5",
-        "magento/module-backend": "~101.0.5",
+        "magento/module-store": "*",
+        "magento/module-backend": "*",
         "magento/module-cms": "*",
-        "magento/module-catalog": "~103.0.5",
+        "magento/module-catalog": "*",
         "magento/module-catalog-inventory": "*",
-        "magento/module-config": "~101.1.5",
+        "magento/module-config": "*",
         "magento/module-ui": "*",
         "magento/module-variable": "*",
         "magento/module-widget": "*",
         "magento/module-catalog-widget": "*",
-        "magento/module-rule": "~100.3.5",
-        "magento/module-directory": "~100.3.5",
+        "magento/module-rule": "*",
+        "magento/module-directory": "*",
         "magento/module-email": "*",
         "magento/module-theme": "*",
         "magento/module-wishlist": "*",

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_common.less

@@ -8,9 +8,9 @@
 //  ___________________________________________________________________
 
 .transition {
-    -o-transition: .5s;
-    -ms-transition: .5s;
     -moz-transition: .5s;
+    -ms-transition: .5s;
+    -o-transition: .5s;
     -webkit-transition: .5s;
     transition: .5s;
 }
@@ -27,12 +27,6 @@
 //
 //  Commented Backslash Hack
 //  ---------------------------------------------
-
-.clearfix {
-    display: block;
-}
-
-
 * html .clearfix {
     height: 1%;
 }

app/code/Magento/PageBuilderAnalytics/composer.json

@@ -2,9 +2,9 @@
     "name": "magento/module-page-builder-analytics",
     "description": "Page Builder Analytics module",
     "require": {
-        "magento/module-analytics": "~100.3.5",
+        "magento/module-analytics": "*",
         "magento/module-page-builder": "*",
-        "magento/framework": "~102.0.5",
+        "magento/framework": "*",
         "php": "~7.1.3||~7.2.0||~7.3.0"
     },
     "type": "magento2-module",

dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/UploadTest.php

@@ -3,41 +3,45 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\PageBuilder\Controller\Adminhtml\ContentType\Image;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\File\Mime;
-use Magento\PageBuilder\Controller\Adminhtml\ContentType\Image\Upload as Controller;
-
-/**
- * Class UploadTest
- */
-class UploadTest extends \PHPUnit\Framework\TestCase
+use Magento\Framework\File\Uploader;
+use Magento\Framework\File\UploaderFactory;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\PageBuilder\Controller\Adminhtml\ContentType\Image\Upload as UploadController;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class UploadTest extends TestCase
 {
     /**
-     * @var \Magento\PageBuilder\Controller\Adminhtml\ContentType\Image\Upload
+     * @var UploadController
      */
     private $controller;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     private $objectManager;
 
     /**
-     * @var \Magento\Framework\File\UploaderFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var UploaderFactory|MockObject
      */
     private $uploaderFactory;
 
     /**
-     * @var \Magento\Framework\Controller\Result\Json|\PHPUnit_Framework_MockObject_MockObject
+     * @var Json|MockObject
      */
     private $resultJson;
 
     /**
-     * @var \Magento\Framework\Controller\Result\JsonFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var JsonFactory|MockObject
      */
     private $resultJsonFactory;
 
@@ -46,23 +50,25 @@ class UploadTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->objectManager = ObjectManager::getInstance();
 
-        $this->uploaderFactory = $this->createPartialMock(\Magento\Framework\File\UploaderFactory::class, ['create']);
+        $this->uploaderFactory = $this->createPartialMock(UploaderFactory::class, ['create']);
 
-        $this->resultJson = $this->getMockBuilder(\Magento\Framework\Controller\Result\Json::class)
+        $this->resultJson = $this->getMockBuilder(Json::class)
             ->setMethods(['setData'])
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->resultJsonFactory = $this->getMockBuilder(\Magento\Framework\Controller\Result\JsonFactory::class)
+        $this->resultJsonFactory = $this->getMockBuilder(JsonFactory::class)
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->resultJsonFactory->expects($this->once())->method('create')->willReturn($this->resultJson);
+        $this->resultJsonFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($this->resultJson);
 
-        $this->controller = $this->objectManager->create(Controller::class, [
+        $this->controller = $this->objectManager->create(UploadController::class, [
             'resultJsonFactory' => $this->resultJsonFactory,
             'uploaderFactory' => $this->uploaderFactory
         ]);
@@ -78,33 +84,40 @@ protected function tearDown()
 
     /**
      * Assert that file validation passes when uploaded file has correct extension and valid mime type
+     * @magentoAppArea adminhtml
      */
     public function testFileValidationPassesWhenFileHasCorrectExtensionAndValidMimeType()
     {
-        $valid_file_pathname = realpath(dirname(__FILE__) . '/../../../../_files/uploader/a.png');
+        $valid_file_pathname = realpath(__DIR__ . '/../../../../_files/uploader/a.png');
 
-        $_FILES = [
-            'background_image' => [
-                'type' => 'image/png',
-                'name' => basename($valid_file_pathname),
-                'tmp_name' => $valid_file_pathname,
-                'size' => filesize($valid_file_pathname),
-                'error' => UPLOAD_ERR_OK,
-            ]
-        ];
+        $this->setFilesGlobalMock($valid_file_pathname);
+        $this->setUploaderMockForField('background_image');
 
-        $uploader = $this->objectManager->create(\Magento\Framework\File\Uploader::class, [
-            'fileId' => 'background_image',
-            'fileMime' => $this->objectManager->create(Mime::class),
-        ]);
+        $this->resultJson->expects($this->once())
+            ->method('setData')
+            ->willReturnCallback(function ($result) {
+                $this->assertNotEquals([
+                    'error' => 'File validation failed.',
+                    'errorcode' => 0
+                ], $result);
+            });
 
-        $this->uploaderFactory
-            ->expects($this->once())
-            ->method('create')
-            ->will($this->returnValue($uploader));
+        $this->controller->execute();
+    }
+
+    /**
+     * Assert that file validation fails when uploaded file has correct extension but invalid mime type
+     * @magentoAppArea adminhtml
+     */
+    public function testFileValidationFailsWhenFileHasCorrectExtensionButInvalidMimeType()
+    {
+        $invalid_file_pathname = realpath(__DIR__ . '/../../../../_files/uploader/not-a.png');
+
+        $this->setFilesGlobalMock($invalid_file_pathname);
+        $this->setUploaderMockForField('background_image');
 
         $this->resultJson->expects($this->once())->method('setData')->willReturnCallback(function ($result) {
-            $this->assertNotEquals([
+            $this->assertEquals([
                 'error' => 'File validation failed.',
                 'errorcode' => 0
             ], $result);
@@ -114,39 +127,40 @@ public function testFileValidationPassesWhenFileHasCorrectExtensionAndValidMimeT
     }
 
     /**
-     * Assert that file validation fails when uploaded file has correct extension but invalid mime type
+     * Initiates Uploader object for `$fieldId` and returns as a result of `UploaderFactory::create()`
+     *
+     * @param string $fieldId
+     * @return void
      */
-    public function testFileValidationFailsWhenFileHasCorrectExtensionButInvalidMimeType()
+    private function setUploaderMockForField(string $fieldId): void
     {
-        $invalid_file_pathname = realpath(dirname(__FILE__) . '/../../../../_files/uploader/not-a.png');
-
-        $_FILES = [
-            'background_image' => [
-                'type' => 'image/png',
-                'name' => basename($invalid_file_pathname),
-                'tmp_name' => $invalid_file_pathname,
-                'size' => filesize($invalid_file_pathname),
-                'error' => UPLOAD_ERR_OK,
-            ]
-        ];
-
-        $uploader = $this->objectManager->create(\Magento\Framework\File\Uploader::class, [
-            'fileId' => 'background_image',
+        $uploader = $this->objectManager->create(Uploader::class, [
+            'fileId' => $fieldId,
             'fileMime' => $this->objectManager->create(Mime::class),
         ]);
 
         $this->uploaderFactory
             ->expects($this->once())
             ->method('create')
             ->will($this->returnValue($uploader));
+    }
 
-        $this->resultJson->expects($this->once())->method('setData')->willReturnCallback(function ($result) {
-            $this->assertEquals([
-                'error' => 'File validation failed.',
-                'errorcode' => 0
-            ], $result);
-        });
-
-        $this->controller->execute();
+    /**
+     * Mock that `$pathname` was uploaded (mock of `$_FILES` array)
+     *
+     * @param string $pathname
+     * @return void
+     */
+    private function setFilesGlobalMock(string $pathname): void
+    {
+        $_FILES = [
+            'background_image' => [
+                'type' => 'image/png',
+                'name' => basename($pathname),
+                'tmp_name' => $pathname,
+                'size' => filesize($pathname),
+                'error' => UPLOAD_ERR_OK,
+            ]
+        ];
     }
 }

dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/pagebuilder.txt

@@ -0,0 +1 @@
+Magento/PageBuilder/Model/ResourceModel/Template/Grid