Merge remote-tracking branch 'tango-ce/MAGETWO-48529-Clean' into MAGETWO-48529

Author: Yuri Kovsher

app/code/Magento/Cms/Model/Wysiwyg/Config.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Cms\Model\Wysiwyg;
 
+use Magento\Framework\Filesystem;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Ui\Component\Wysiwyg\ConfigInterface;
 
 /**
@@ -91,6 +93,11 @@ class Config extends \Magento\Framework\DataObject implements ConfigInterface
      */
     protected $_storeManager;
 
+    /**
+     * @var Filesystem
+     */
+    protected $filesystem;
+
     /**
      * @param \Magento\Backend\Model\UrlInterface $backendUrl
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -100,6 +107,7 @@ class Config extends \Magento\Framework\DataObject implements ConfigInterface
      * @param \Magento\Widget\Model\Widget\Config $widgetConfig
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param Filesystem $filesystem
      * @param array $windowSize
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -113,6 +121,7 @@ public function __construct(
         \Magento\Widget\Model\Widget\Config $widgetConfig,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
+        Filesystem $filesystem,
         array $windowSize = [],
         array $data = []
     ) {
@@ -125,6 +134,7 @@ public function __construct(
         $this->_widgetConfig = $widgetConfig;
         $this->_windowSize = $windowSize;
         $this->_storeManager = $storeManager;
+        $this->filesystem = $filesystem;
         parent::__construct($data);
     }
 
@@ -157,6 +167,9 @@ public function getConfig($data = [])
                 'add_widgets' => true,
                 'no_display' => false,
                 'encode_directives' => true,
+                'baseStaticUrl' => $this->_assetRepo->getStaticViewFileContext()->getBaseUrl(),
+                'baseStaticDefaultUrl' => str_replace('index.php/', '', $this->_backendUrl->getBaseUrl())
+                    . $this->filesystem->getUri(DirectoryList::STATIC_VIEW) . '/',
                 'directives_url' => $this->_backendUrl->getUrl('cms/wysiwyg/directive'),
                 'popup_css' => $this->_assetRepo->getUrl(
                     'mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/dialog.css'

app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ConfigTest.php

@@ -7,6 +7,7 @@
 
 /**
  * @covers \Magento\Cms\Model\Wysiwyg\Config
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ConfigTest extends \PHPUnit_Framework_TestCase
 {
@@ -60,13 +61,19 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
      */
     protected $assetFileMock;
 
+    /**
+     * @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $filesystemMock;
+
     /**
      * @var array
      */
     protected $windowSize = [];
 
     protected function setUp()
     {
+        $this->filesystemMock = $this->getMock(\Magento\Framework\Filesystem::class, [], [], '', false);
         $this->backendUrlMock = $this->getMockBuilder('Magento\Backend\Model\UrlInterface')
             ->disableOriginalConstructor()
             ->getMock();
@@ -110,7 +117,8 @@ protected function setUp()
                 'widgetConfig' => $this->widgetConfigMock,
                 'scopeConfig' => $this->scopeConfigMock,
                 'windowSize' => $this->windowSize,
-                'storeManager' => $this->storeManagerMock
+                'storeManager' => $this->storeManagerMock,
+                'filesystem' => $this->filesystemMock,
             ]
         );
     }
@@ -139,12 +147,26 @@ public function testGetConfig($data, $isAuthorizationAllowed, $expectedResults)
                 ['cms/wysiwyg/directive'],
                 ['cms/wysiwyg_images/index']
             );
+        $this->backendUrlMock->expects($this->once())
+            ->method('getBaseUrl')
+            ->willReturn('localhost/index.php/');
         $this->assetRepoMock->expects($this->atLeastOnce())
             ->method('getUrl')
             ->withConsecutive(
                 ['mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/dialog.css'],
                 ['mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css']
             );
+        $this->filesystemMock->expects($this->once())
+            ->method('getUri')
+            ->willReturn('pub/static');
+        /** @var \Magento\Framework\View\Asset\ContextInterface|\PHPUnit_Framework_MockObject_MockObject $contextMock */
+        $contextMock = $this->getMock(\Magento\Framework\View\Asset\ContextInterface::class);
+        $contextMock->expects($this->once())
+            ->method('getBaseUrl')
+            ->willReturn('localhost/pub/static/');
+        $this->assetRepoMock->expects($this->once())
+            ->method('getStaticViewFileContext')
+            ->willReturn($contextMock);
         $this->authorizationMock->expects($this->atLeastOnce())
             ->method('isAllowed')
             ->with('Magento_Cms::media_gallery')
@@ -161,6 +183,8 @@ public function testGetConfig($data, $isAuthorizationAllowed, $expectedResults)
         $this->assertEquals($expectedResults[0], $config->getData('someData'));
         $this->assertEquals($expectedResults[1], $config->getData('wysiwygPluginSettings'));
         $this->assertEquals($expectedResults[2], $config->getData('pluginSettings'));
+        $this->assertEquals('localhost/pub/static/', $config->getData('baseStaticUrl'));
+        $this->assertEquals('localhost/pub/static/', $config->getData('baseStaticDefaultUrl'));
     }
 
     public function getConfigDataProvider()

lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js

@@ -19,6 +19,10 @@ define([
         mediaBrowserTargetElementId: null,
 
         initialize: function(htmlId, config) {
+            if (config.baseStaticUrl && config.baseStaticDefaultUrl) {
+                tinyMCE.baseURL = tinyMCE.baseURL.replace(config.baseStaticUrl, config.baseStaticDefaultUrl);
+            }
+
             this.id = htmlId;
             this.config = config;
 
@@ -352,4 +356,4 @@ define([
         }
     };
 
-});
+});