Skip to content

Commit d8f1bb0

Browse files
author
Joan He
committed
Merge remote-tracking branch 'upstream/develop' into MAGETWO-28383-merge
Conflicts: app/code/Magento/Core/Test/Unit/Model/File/Storage/_files/config.xml dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/Media/Synchronization/ErrorTest.php dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/Media/Synchronization/SuccessTest.php dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/MediaTest.php dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ImageTest.php dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Option/Type/FileTest.php dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Type/SimpleTest.php dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Type/VirtualTest.php dev/tests/unit/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php dev/tests/unit/testsuite/Magento/Core/Model/File/Storage/_files/config.xml dev/tests/unit/testsuite/Magento/Customer/Controller/Adminhtml/Index/ViewfileTest.php dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/FileTest.php dev/tests/unit/testsuite/Magento/Downloadable/Model/Product/TypeTest.php dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/FileTest.php dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/ImageTest.php dev/tests/unit/testsuite/Magento/Framework/App/StaticResourceTest.php dev/tests/unit/testsuite/Magento/Framework/Code/Model/File/Validator/NotProtectedExtensionTest.php dev/tests/unit/testsuite/Magento/Framework/Config/ViewTest.php dev/tests/unit/testsuite/Magento/Framework/Less/File/Collector/AggregatedTest.php dev/tests/unit/testsuite/Magento/Framework/Less/File/Collector/LibraryTest.php dev/tests/unit/testsuite/Magento/Framework/View/Asset/Minified/AbstractAssetTestCase.php dev/tests/unit/testsuite/Magento/Framework/View/Asset/Minified/ImmutablePathAssetTest.php dev/tests/unit/testsuite/Magento/Framework/View/Asset/Minified/MutablePathAssetTest.php dev/tests/unit/testsuite/Magento/Framework/View/Asset/PreProcessor/PoolTest.php dev/tests/unit/testsuite/Magento/Framework/View/Asset/SourceTest.php dev/tests/unit/testsuite/Magento/Framework/View/ConfigTest.php dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php dev/tests/unit/testsuite/Magento/MediaStorage/App/MediaTest.php dev/tests/unit/testsuite/Magento/MediaStorage/Helper/File/MediaTest.php dev/tests/unit/testsuite/Magento/MediaStorage/Helper/File/Storage/DatabaseTest.php dev/tests/unit/testsuite/Magento/MediaStorage/Helper/File/StorageTest.php dev/tests/unit/testsuite/Magento/MediaStorage/Model/Asset/Plugin/CleanMergedJsCssTest.php dev/tests/unit/testsuite/Magento/MediaStorage/Model/Config/Source/Storage/Media/DatabaseTest.php dev/tests/unit/testsuite/Magento/MediaStorage/Model/File/Storage/ConfigTest.php dev/tests/unit/testsuite/Magento/MediaStorage/Model/File/Storage/Directory/DatabaseTest.php dev/tests/unit/testsuite/Magento/MediaStorage/Model/File/Storage/MediaTest.php dev/tests/unit/testsuite/Magento/MediaStorage/Model/File/Storage/RequestTest.php dev/tests/unit/testsuite/Magento/MediaStorage/Model/File/Storage/SynchronizationTest.php dev/tests/unit/testsuite/Magento/MediaStorage/Model/File/Storage/_files/config.xml dev/tests/unit/testsuite/Magento/MediaStorage/Model/Resource/Db/AbstractTest.php dev/tests/unit/testsuite/Magento/MediaStorage/Model/Resource/File/Storage/FileTest.php dev/tests/unit/testsuite/Magento/RequireJs/Block/Html/Head/ConfigTest.php dev/tests/unit/testsuite/Magento/RequireJs/Model/FileManagerTest.php dev/tests/unit/testsuite/Magento/Sales/Model/DownloadTest.php dev/tests/unit/testsuite/Magento/Theme/Block/Html/Header/LogoTest.php dev/tests/unit/testsuite/Magento/Theme/Model/Favicon/FaviconTest.php dev/tests/unit/testsuite/Magento/Theme/Model/Uploader/ServiceTest.php dev/tests/unit/testsuite/Magento/Theme/Model/Wysiwyg/StorageTest.php
1 parent ed075f7 commit d8f1bb0

File tree

98 files changed

+447
-9773
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+447
-9773
lines changed

‎app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ class ErrorTest extends \PHPUnit_Framework_TestCase
2424

2525
protected function setUp()
2626
{
27-
$this->_syncFlagMock = $this->getMock('Magento\Core\Model\File\Storage\Flag', [], [], '', false);
27+
$this->_syncFlagMock = $this->getMock('Magento\MediaStorage\Model\File\Storage\Flag', [], [], '', false);
2828

29-
$this->_fileStorage = $this->getMock('Magento\Core\Model\File\Storage\Flag', [], [], '', false);
29+
$this->_fileStorage = $this->getMock('Magento\MediaStorage\Model\File\Storage\Flag', [], [], '', false);
3030
$this->_fileStorage->expects($this->any())->method('loadSelf')->will($this->returnValue($this->_syncFlagMock));
3131

3232
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);

‎app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/SuccessTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ class SuccessTest extends \PHPUnit_Framework_TestCase
2525
protected function setUp()
2626
{
2727
$this->_syncFlagMock = $this->getMock(
28-
'Magento\Core\Model\File\Storage\Flag',
28+
'Magento\MediaStorage\Model\File\Storage\Flag',
2929
['getState', 'getFlagData', 'setState', '__sleep', '__wakeup', 'save'],
3030
[],
3131
'',
3232
false
3333
);
3434

35-
$this->_fileStorage = $this->getMock('Magento\Core\Model\File\Storage\Flag', [], [], '', false);
35+
$this->_fileStorage = $this->getMock('Magento\MediaStorage\Model\File\Storage\Flag', [], [], '', false);
3636
$this->_fileStorage->expects($this->any())->method('loadSelf')->will($this->returnValue($this->_syncFlagMock));
3737

3838
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -80,11 +80,11 @@ public function testIsDisplayed($expectedFirstRun, $data, $state)
8080
public function isDisplayedDataProvider()
8181
{
8282
return [
83-
[false, ['has_errors' => 1], \Magento\Core\Model\File\Storage\Flag::STATE_FINISHED],
83+
[false, ['has_errors' => 1], \Magento\MediaStorage\Model\File\Storage\Flag::STATE_FINISHED],
8484
[false, ['has_errors' => true], false],
85-
[true, [], \Magento\Core\Model\File\Storage\Flag::STATE_FINISHED],
86-
[false, ['has_errors' => 0], \Magento\Core\Model\File\Storage\Flag::STATE_RUNNING],
87-
[true, ['has_errors' => 0], \Magento\Core\Model\File\Storage\Flag::STATE_FINISHED]
85+
[true, [], \Magento\MediaStorage\Model\File\Storage\Flag::STATE_FINISHED],
86+
[false, ['has_errors' => 0], \Magento\MediaStorage\Model\File\Storage\Flag::STATE_RUNNING],
87+
[true, ['has_errors' => 0], \Magento\MediaStorage\Model\File\Storage\Flag::STATE_FINISHED]
8888
];
8989
}
9090

‎app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/MediaTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected function setUp()
4747
$this->_objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
4848
$eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
4949

50-
$fileStorageDb = $this->getMock('Magento\Core\Helper\File\Storage\Database', [], [], '', false);
50+
$fileStorageDb = $this->getMock('Magento\MediaStorage\Helper\File\Storage\Database', [], [], '', false);
5151
$this->resourceModel = $this->getMock(
5252
'Magento\Catalog\Model\Resource\Product\Attribute\Backend\Media',
5353
[

‎app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
4141
protected $config;
4242

4343
/**
44-
* @var \Magento\Core\Helper\File\Storage\Database|\PHPUnit_Framework_MockObject_MockObject
44+
* @var \Magento\MediaStorage\Helper\File\Storage\Database|\PHPUnit_Framework_MockObject_MockObject
4545
*/
4646
protected $coreFileHelper;
4747

@@ -92,7 +92,7 @@ protected function setUp()
9292
$this->config = $this->getMockBuilder('Magento\Catalog\Model\Product\Media\Config')
9393
->setMethods(['getBaseMediaPath'])->disableOriginalConstructor()->getMock();
9494
$this->config->expects($this->any())->method('getBaseMediaPath')->will($this->returnValue('catalog/product'));
95-
$this->coreFileHelper = $this->getMockBuilder('Magento\Core\Helper\File\Storage\Database')
95+
$this->coreFileHelper = $this->getMockBuilder('Magento\MediaStorage\Helper\File\Storage\Database')
9696
->setMethods(['saveFile', 'deleteFolder'])->disableOriginalConstructor()->getMock();
9797

9898
$this->mediaDirectory = $this->getMockBuilder('Magento\Framework\Filesystem\Directory\Write')

‎app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Type/FileTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class FileTest extends \PHPUnit_Framework_TestCase
1818
protected $rootDirectory;
1919

2020
/**
21-
* @var \Magento\Core\Helper\File\Storage\Database|\PHPUnit_Framework_MockObject_MockObject
21+
* @var \Magento\MediaStorage\Helper\File\Storage\Database|\PHPUnit_Framework_MockObject_MockObject
2222
*/
2323
protected $coreFileStorageDatabase;
2424

@@ -32,7 +32,7 @@ public function setUp()
3232
->getMockForAbstractClass();
3333

3434
$this->coreFileStorageDatabase = $this->getMock(
35-
'Magento\Core\Helper\File\Storage\Database',
35+
'Magento\MediaStorage\Helper\File\Storage\Database',
3636
['copyFile'],
3737
[],
3838
'',

‎app/code/Magento/Catalog/Test/Unit/Model/Product/Type/SimpleTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ protected function setUp()
1616
{
1717
$objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
1818
$eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
19-
$fileStorageDbMock = $this->getMock('Magento\Core\Helper\File\Storage\Database', [], [], '', false);
19+
$fileStorageDbMock = $this->getMock('Magento\MediaStorage\Helper\File\Storage\Database', [], [], '', false);
2020
$filesystem = $this->getMockBuilder('Magento\Framework\Filesystem')
2121
->disableOriginalConstructor()
2222
->getMock();

‎app/code/Magento/Catalog/Test/Unit/Model/Product/Type/VirtualTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ protected function setUp()
1717
$objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
1818
$eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
1919
$coreRegistryMock = $this->getMock('Magento\Framework\Registry', [], [], '', false);
20-
$fileStorageDbMock = $this->getMock('Magento\Core\Helper\File\Storage\Database', [], [], '', false);
20+
$fileStorageDbMock = $this->getMock('Magento\MediaStorage\Helper\File\Storage\Database', [], [], '', false);
2121
$filesystem = $this->getMockBuilder('Magento\Framework\Filesystem')
2222
->disableOriginalConstructor()
2323
->getMock();

‎app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,22 @@ class StorageTest extends \PHPUnit_Framework_TestCase
5050
protected $_storageCollectionFactoryMock;
5151

5252
/**
53-
* @var \Magento\Core\Model\File\Storage\FileFactory|\PHPUnit_Framework_MockObject_MockObject
53+
* @var \Magento\MediaStorage\Model\File\Storage\FileFactory|PHPUnit_Framework_MockObject_MockObject
5454
*/
5555
protected $_storageFileFactoryMock;
5656

5757
/**
58-
* @var \Magento\Core\Model\File\Storage\DatabaseFactory|\PHPUnit_Framework_MockObject_MockObject
58+
* @var \Magento\MediaStorage\Model\File\Storage\DatabaseFactory|PHPUnit_Framework_MockObject_MockObject
5959
*/
6060
protected $_storageDatabaseFactoryMock;
6161

6262
/**
63-
* @var \Magento\Core\Model\File\Storage\Directory\DatabaseFactory|\PHPUnit_Framework_MockObject_MockObject
63+
* @var \Magento\MediaStorage\Model\File\Storage\Directory\DatabaseFactory|PHPUnit_Framework_MockObject_MockObject
6464
*/
6565
protected $_directoryDatabaseFactoryMock;
6666

6767
/**
68-
* @var \Magento\Core\Model\File\UploaderFactory|\PHPUnit_Framework_MockObject_MockObject
68+
* @var \Magento\MediaStorage\Model\File\UploaderFactory|PHPUnit_Framework_MockObject_MockObject
6969
*/
7070
protected $_uploaderFactoryMock;
7171

@@ -171,27 +171,29 @@ protected function setUp()
171171
false
172172
);
173173
$this->_storageFileFactoryMock = $this->getMock(
174-
'Magento\Core\Model\File\Storage\FileFactory',
174+
'Magento\MediaStorage\Model\File\Storage\FileFactory',
175175
[],
176176
[],
177177
'',
178178
false
179179
);
180180
$this->_storageDatabaseFactoryMock = $this->getMock(
181-
'Magento\Core\Model\File\Storage\DatabaseFactory',
181+
'Magento\MediaStorage\Model\File\Storage\DatabaseFactory',
182182
[],
183183
[],
184184
'',
185185
false
186186
);
187187
$this->_directoryDatabaseFactoryMock = $this->getMock(
188-
'Magento\Core\Model\File\Storage\Directory\DatabaseFactory',
188+
'Magento\MediaStorage\Model\File\Storage\Directory\DatabaseFactory',
189189
[],
190190
[],
191191
'',
192192
false
193193
);
194-
$this->_uploaderFactoryMock = $this->getMock('Magento\Core\Model\File\UploaderFactory', [], [], '', false);
194+
$this->_uploaderFactoryMock = $this->getMockBuilder('Magento\MediaStorage\Model\File\UploaderFactory')
195+
->disableOriginalConstructor()
196+
->getMock();
195197
$this->_sessionMock = $this->getMock('Magento\Backend\Model\Session', [], [], '', false);
196198
$this->_backendUrlMock = $this->getMock('Magento\Backend\Model\Url', [], [], '', false);
197199

@@ -203,7 +205,7 @@ protected function setUp()
203205
'backendUrl' => $this->_backendUrlMock,
204206
'cmsWysiwygImages' => $this->_imageHelperMock,
205207
'coreFileStorageDb' => $this->getMock(
206-
'Magento\Core\Helper\File\Storage\Database',
208+
'Magento\MediaStorage\Helper\File\Storage\Database',
207209
[],
208210
[],
209211
'',

‎app/code/Magento/Config/Test/Unit/Model/Config/Source/Storage/Media/DatabaseTest.php

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
namespace Magento\ConfigurableProduct\Test\Unit\Model\Product\Type;
1010

11+
use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
12+
1113
/**
1214
* Class \Magento\ConfigurableProduct\Test\Unit\Model\Product\Type\ConfigurableTest
1315
*
@@ -95,7 +97,7 @@ protected function setUp()
9597
'',
9698
false
9799
);
98-
$fileStorageDbMock = $this->getMock('Magento\Core\Helper\File\Storage\Database', [], [], '', false);
100+
$fileStorageDbMock = $this->getMock('Magento\MediaStorage\Helper\File\Storage\Database', [], [], '', false);
99101
$filesystem = $this->getMockBuilder('Magento\Framework\Filesystem')
100102
->disableOriginalConstructor()
101103
->getMock();
@@ -231,8 +233,8 @@ public function testSave()
231233
->will($this->returnValue($attribute));
232234

233235
$attributeCollection = $this->getMockBuilder(
234-
'\Magento\ConfigurableProduct\Model\Resource\Product\Type\Configurable\Attribute\Collection'
235-
)->setMethods(['setProductFilter', 'addFieldToFilter', 'walk'])->disableOriginalConstructor()
236+
'\Magento\ConfigurableProduct\Model\Resource\Product\Type\Configurable\Attribute\Collection'
237+
)->setMethods(['setProductFilter', 'addFieldToFilter', 'walk'])->disableOriginalConstructor()
236238
->getMock();
237239
$this->_attributeCollectionFactory->expects($this->any())->method('create')
238240
->will($this->returnValue($attributeCollection));
@@ -296,7 +298,7 @@ public function testGetUsedProducts()
296298
->will($this->returnValue($attributeCollection));
297299
$product = $this->getMockBuilder('\Magento\Catalog\Model\Product')
298300
->setMethods(['dataHasChangedFor', 'getConfigurableAttributesData', 'getStoreId',
299-
'getId', 'getData', 'hasData', 'getAssociatedProductIds', '__wakeup', '__sleep',
301+
'getId', 'getData', 'hasData', 'getAssociatedProductIds', '__wakeup', '__sleep',
300302
])->disableOriginalConstructor()
301303
->getMock();
302304
$product->expects($this->any())->method('getConfigurableAttributesData')
@@ -316,7 +318,7 @@ public function testGetUsedProducts()
316318
'Magento\ConfigurableProduct\Model\Resource\Product\Type\Configurable\Product\Collection'
317319
)->setMethods(
318320
['setFlag', 'setProductFilter', 'addStoreFilter', 'addAttributeToSelect', 'addFilterByRequiredOptions',
319-
'setStoreId', ]
321+
'setStoreId', ]
320322
)->disableOriginalConstructor()
321323
->getMock();
322324
$productCollection->expects($this->any())->method('addAttributeToSelect')->will($this->returnSelf());

0 commit comments

Comments
 (0)