Merge remote-tracking branch 'tango-ce/MAGETWO-32989' into MAGETWO-32571

Author: Yuri Kovsher

app/code/Magento/Widget/Model/Template/Filter.php

@@ -110,4 +110,17 @@ public function widgetDirective($construction)
 
         return $widget->toHtml();
     }
+
+    /**
+     * Retrieve media file URL directive
+     *
+     * @param string[] $construction
+     * @return string
+     */
+    public function mediaDirective($construction)
+    {
+        $params = $this->_getIncludeParameters($construction[2]);
+        return $this->_storeManager->getStore()
+            ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $params['url'];
+    }
 }

dev/tests/integration/testsuite/Magento/Widget/Model/Template/FilterTest.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Widget\Model\Template;
+
+class FilterTest extends \PHPUnit_Framework_TestCase
+{
+    public function testMediaDirective()
+    {
+        $image = 'wysiwyg/VB.png';
+        $construction = ['{{media url="' . $image . '"}}', 'media', ' url="' . $image . '"'];
+        $baseUrl = 'http://localhost/pub/media/';
+
+        /** @var \Magento\Widget\Model\Template\Filter $filter */
+        $filter = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            'Magento\Widget\Model\Template\Filter'
+        );
+        $result = $filter->mediaDirective($construction);
+        $this->assertEquals($baseUrl . $image, $result);
+    }
+}

dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Widget\Model\Template;
+
+use Magento\Framework\Store\StoreManagerInterface;
+
+class FilterTest extends \PHPUnit_Framework_TestCase
+{
+    public function testMediaDirective()
+    {
+        $image = 'wysiwyg/VB.png';
+        $construction = ['{{media url="' . $image . '"}}', 'media', ' url="' . $image . '"'];
+        $baseUrl = 'http://localhost/pub/media/';
+
+        /** @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject $storeMock */
+        $storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
+        $storeMock->expects($this->once())->method('getBaseUrl')->with(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA)
+            ->willReturn($baseUrl);
+
+        /** @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject $storeManagerMock */
+        $storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+        $storeManagerMock->expects($this->once())->method('getStore')->will($this->returnValue($storeMock));
+
+        /** @var \Magento\Widget\Model\Template\Filter $filter */
+        $filter = (new \Magento\TestFramework\Helper\ObjectManager($this))
+            ->getObject(
+                'Magento\Widget\Model\Template\Filter',
+                ['storeManager' => $storeManagerMock]
+            );
+        $result = $filter->mediaDirective($construction);
+        $this->assertEquals($baseUrl . $image, $result);
+    }
+}