Merge branch 'develop' of github.com:magento/magento2-page-builder into PB-493

Author: anthoula

app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Uploader/OpenDialogUrl.php

@@ -10,6 +10,7 @@
 
 use Magento\PageBuilder\Model\Config\ContentType\AdditionalData\ProviderInterface;
 use Magento\Backend\Model\Url;
+use Magento\Ui\Component\Form\Element\DataType\Media\OpenDialogUrl as OpenDialogConfig;
 
 /**
  * Provides open dialog URL for media gallery slideout
@@ -21,12 +22,21 @@ class OpenDialogUrl implements ProviderInterface
      */
     private $urlBuilder;
 
+    /**
+     * @var OpenDialogConfig
+     */
+    private $openDialogConfig;
+
     /**
      * @param Url $urlBuilder
+     * @param OpenDialogConfig $openDialogConfig
      */
-    public function __construct(Url $urlBuilder)
-    {
+    public function __construct(
+        Url $urlBuilder,
+        OpenDialogConfig $openDialogConfig // phpstan:ignore
+    ) {
         $this->urlBuilder = $urlBuilder;
+        $this->openDialogConfig = $openDialogConfig;
     }
 
     /**
@@ -35,10 +45,7 @@ public function __construct(Url $urlBuilder)
     public function getData(string $itemName) : array
     {
         return [
-            $itemName => $this->urlBuilder->getUrl(
-                'cms/wysiwyg_images/index',
-                ['_secure' => true]
-            )
+            $itemName => $this->urlBuilder->getUrl($this->openDialogConfig->get(), ['_secure' => true])
         ];
     }
 }

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/Test/Mftf/Suite/PageBuilderDisabledSuite.xml

@@ -72,6 +72,8 @@
         </actionGroup>
         <!-- Delete image A -->
         <comment stepKey="deleteImageA" userInput="Delete image A"/>
+        <waitForElementVisible selector="{{MediaGallerySection.lastImageOrImageCopy(PageBuilderBackgroundImage_GIF.fileName, PageBuilderBackgroundImage_GIF.extension)}}" stepKey="waitForLastImage"/>
+        <click selector="{{MediaGallerySection.lastImageOrImageCopy(PageBuilderBackgroundImage_GIF.fileName, PageBuilderBackgroundImage_GIF.extension)}}" stepKey="selectImage"/>
         <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage1">
             <argument name="Image" value="PageBuilderBackgroundImage_GIF"/>
         </actionGroup>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemDeleteImageTest.xml

@@ -8,11 +8,11 @@
 namespace Magento\PageBuilder\Test\Unit\Model\Catalog;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\PageBuilder\Model\Catalog\Sorting;
+use Magento\PageBuilder\Model\Catalog\Sorting\Factory;
+use Magento\PageBuilder\Model\Catalog\Sorting\OptionInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\MockObject\Stub\ReturnValueMap;
-use Magento\PageBuilder\Model\Catalog\Sorting\OptionInterface;
-use Magento\PageBuilder\Model\Catalog\Sorting\Factory;
-use Magento\PageBuilder\Model\Catalog\Sorting;
 use PHPUnit\Framework\TestCase;
 
 /**

app/code/Magento/PageBuilder/Test/Unit/Model/Catalog/SortingTest.php

@@ -10,9 +10,8 @@ define([
     'Magento_Ui/js/form/element/image-uploader',
     'Magento_PageBuilder/js/resource/resize-observer/ResizeObserver',
     'Magento_PageBuilder/js/events',
-    'mage/translate',
-    'mage/adminhtml/browser'
-], function ($, _, uiRegistry, Uploader, ResizeObserver, events, $t, browser) {
+    'mage/translate'
+], function ($, _, uiRegistry, Uploader, ResizeObserver, events, $t) {
     'use strict';
 
     var initializedOnce = false;
@@ -72,14 +71,6 @@ define([
             }
         },
 
-        /**
-         * {@inheritDoc}
-         */
-        openMediaBrowserDialog: function (imageUploader, e) {
-            browser.modalLoaded = false;
-            this._super(imageUploader, e);
-        },
-
         /**
          * {@inheritDoc}
          */