Merge remote-tracking branch 'api/MAGETWO-34527' into Bug-Fixes

Author: Bryant Luk

app/code/Magento/Config/Model/Config/Backend/Image/Logo.php

@@ -37,4 +37,14 @@ protected function _addWhetherScopeInfo()
     {
         return true;
     }
+
+    /**
+     * Getter for allowed extensions of uploaded files.
+     *
+     * @return string[]
+     */
+    protected function _getAllowedExtensions()
+    {
+        return ['jpg', 'jpeg', 'gif', 'png', 'svg'];
+    }
 }

app/code/Magento/Config/Test/Unit/Model/Config/Backend/Image/LogoTest.php

@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Config\Test\Unit\Model\Config\Backend\Image;
+
+class LogoTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Config\Model\Config\Backend\Image\Logo
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $uploaderFactoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $uploaderMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestDataMock;
+
+    public function setUp()
+    {
+        $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->uploaderFactoryMock = $this->getMockBuilder('\Magento\MediaStorage\Model\File\UploaderFactory')
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->uploaderMock = $this->getMockBuilder('\Magento\MediaStorage\Model\File\Uploader')
+            ->setMethods(['setAllowedExtensions', 'save'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->uploaderFactoryMock
+            ->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($this->uploaderMock));
+        $this->requestDataMock = $this
+            ->getMockBuilder('\Magento\Config\Model\Config\Backend\File\RequestData\RequestDataInterface')
+            ->setMethods(['getTmpName'])
+            ->getMockForAbstractClass();
+        $mediaDirectoryMock = $this->getMockBuilder('\Magento\Framework\Filesystem\Directory\WriteInterface')
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $filesystemMock = $this->getMockBuilder('\Magento\Framework\Filesystem')
+            ->disableOriginalConstructor()
+            ->setMethods(['getDirectoryWrite'])
+            ->getMock();
+        $filesystemMock->expects($this->once())
+            ->method('getDirectoryWrite')
+            ->will($this->returnValue($mediaDirectoryMock));
+        $this->model = $helper->getObject(
+            'Magento\Config\Model\Config\Backend\Image\Logo',
+            [
+                'uploaderFactory' => $this->uploaderFactoryMock,
+                'requestData' => $this->requestDataMock,
+                'filesystem' => $filesystemMock,
+            ]
+        );
+    }
+
+    public function testBeforeSave()
+    {
+        $this->requestDataMock->expects($this->once())
+            ->method('getTmpName')
+            ->will($this->returnValue('/tmp/val'));
+        $this->uploaderMock->expects($this->once())
+            ->method('setAllowedExtensions')
+            ->with($this->equalTo(['jpg', 'jpeg', 'gif', 'png', 'svg']));
+        $this->model->beforeSave();
+    }
+}

app/code/Magento/Theme/etc/adminhtml/system.xml

@@ -61,7 +61,7 @@
                 <label>Header</label>
                 <field id="logo_src" translate="label" type="image" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Logo Image</label>
-                    <comment>Allowed file types:PNG, GIF, JPG, JPEG.</comment>
+                    <comment>Allowed file types:PNG, GIF, JPG, JPEG, SVG.</comment>
                     <backend_model>Magento\Config\Model\Config\Backend\Image\Logo</backend_model>
                     <base_url type="media" scope_info="1">logo</base_url>
                 </field>