MAGETWO-22618: View File Collectors Don't Support All glob() Patterns

Author: Yuri Kovsher

lib/internal/Magento/Framework/View/Test/Unit/File/Collector/ThemeTest.php

@@ -5,15 +5,21 @@
  */
 namespace Magento\Framework\View\Test\Unit\File\Collector;
 
-use \Magento\Framework\View\File\Collector\Theme;
-
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\View\File\Factory;
 
-/**
- * Tests Theme
- */
 class ThemeTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var \Magento\Framework\View\File\Collector\Theme
+     */
+    protected $themeFileCollector;
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    protected $objectManagerHelper;
+
     /**
      * @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -27,7 +33,7 @@ class ThemeTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $themesDirectoryMock;
+    protected $directoryMock;
 
     /**
      * @var \Magento\Framework\View\Design\ThemeInterface|\PHPUnit_Framework_MockObject_MockObject
@@ -37,99 +43,101 @@ class ThemeTest extends \PHPUnit_Framework_TestCase
     public function setup()
     {
         $this->filesystemMock = $this->getMockBuilder('Magento\Framework\Filesystem')
-            ->disableOriginalConstructor()->getMock();
-
-        $this->themesDirectoryMock = $this->getMockBuilder('Magento\Framework\Filesystem\Directory\ReadInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->directoryMock = $this->getMockBuilder('Magento\Framework\Filesystem\Directory\ReadInterface')
             ->getMock();
-        $this->filesystemMock->expects($this->any())->method('getDirectoryRead')
-            ->will($this->returnValue($this->themesDirectoryMock));
-
         $this->fileFactoryMock = $this->getMockBuilder('Magento\Framework\View\File\Factory')
-            ->disableOriginalConstructor()->getMock();
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->themeMock = $this->getMockBuilder('Magento\Framework\View\Design\ThemeInterface')
+            ->getMock();
 
-        $this->themeMock = $this->getMockBuilder('Magento\Framework\View\Design\ThemeInterface')->getMock();
+        $this->filesystemMock->expects($this->any())
+            ->method('getDirectoryRead')
+            ->willReturn($this->directoryMock);
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->themeFileCollector = $this->objectManagerHelper->getObject(
+            'Magento\Framework\View\File\Collector\Theme',
+            [
+                'filesystem' => $this->filesystemMock,
+                'fileFactory' => $this->fileFactoryMock
+            ]
+        );
     }
 
     public function testGetFilesEmpty()
     {
-        $this->themesDirectoryMock->expects($this->any())->method('search')->will($this->returnValue([]));
-        $theme = new Theme(
-            $this->filesystemMock,
-            $this->fileFactoryMock
-        );
+        $this->directoryMock->expects($this->any())
+            ->method('search')
+            ->willReturn([]);
 
         // Verify no files were returned
-        $this->assertEquals([], $theme->getFiles($this->themeMock, ''));
+        $this->assertEquals([], $this->themeFileCollector->getFiles($this->themeMock, ''));
     }
 
     public function testGetFilesSingle()
     {
         $filePath = '/opt/magento2/app/design/frontend/Magento/blank/Magento_Customer/css/something.less';
-        $this->themesDirectoryMock->expects($this->once())
-            ->method('search')
-            ->will($this->returnValue(['file']));
-        $this->themesDirectoryMock->expects($this->once())
-            ->method('getAbsolutePath')
-            ->with('file')
-            ->will($this->returnValue($filePath));
 
         $fileMock = $this->getMockBuilder('Magento\Framework\View\File')
-            ->disableOriginalConstructor()->getMock();
+            ->disableOriginalConstructor()
+            ->getMock();
 
+        $this->directoryMock->expects($this->once())
+            ->method('search')
+            ->willReturn(['file']);
+        $this->directoryMock->expects($this->once())
+            ->method('getAbsolutePath')
+            ->with('file')
+            ->willReturn($filePath);
         $this->fileFactoryMock->expects($this->once())
             ->method('create')
-            ->with($this->equalTo($filePath), null, $this->themeMock)
-            ->will($this->returnValue($fileMock));
-
-        $theme = new Theme(
-            $this->filesystemMock,
-            $this->fileFactoryMock
-        );
+            ->with($filePath, null, $this->themeMock)
+            ->willReturn($fileMock);
 
         // One file was returned from search
-        $this->assertEquals([$fileMock], $theme->getFiles($this->themeMock, 'css/*.less'));
+        $this->assertEquals([$fileMock], $this->themeFileCollector->getFiles($this->themeMock, 'css/*.less'));
     }
 
     public function testGetFilesMultiple()
     {
         $dirPath = '/Magento_Customer/css/';
         $themePath = '/opt/magento2/app/design/frontend/Magento/blank';
         $searchPath = 'css/*.test';
-        $this->themeMock->expects($this->any())->method('getFullPath')
-            ->will($this->returnValue($themePath));
-
-        $this->themesDirectoryMock->expects($this->any())
-            ->method('getAbsolutePath')
-            ->will(
-                $this->returnValueMap(
-                    [
-                        ['fileA.test', $dirPath . 'fileA.test'],
-                        ['fileB.tst', $dirPath . 'fileB.tst'],
-                        ['fileC.test', $dirPath . 'fileC.test'],
-                    ]
-                )
-            );
 
         $fileMock = $this->getMockBuilder('Magento\Framework\View\File')
-            ->disableOriginalConstructor()->getMock();
+            ->disableOriginalConstructor()
+            ->getMock();
 
+        $this->themeMock->expects($this->any())
+            ->method('getFullPath')
+            ->willReturn($themePath);
+        $this->directoryMock->expects($this->any())
+            ->method('getAbsolutePath')
+            ->willReturnMap(
+                [
+                    ['fileA.test', $dirPath . 'fileA.test'],
+                    ['fileB.tst', $dirPath . 'fileB.tst'],
+                    ['fileC.test', $dirPath . 'fileC.test'],
+                ]
+            );
         // Verifies correct files are searched for
-        $this->themesDirectoryMock->expects($this->once())
+        $this->directoryMock->expects($this->once())
             ->method('search')
             ->with($themePath . '/' . $searchPath)
-            ->will($this->returnValue(['fileA.test', 'fileC.test']));
-
+            ->willReturn(['fileA.test', 'fileC.test']);
         // Verifies Magento_Customer was correctly produced from directory path
         $this->fileFactoryMock->expects($this->any())
             ->method('create')
-            ->with($this->isType('string'), null, $this->equalTo($this->themeMock))
-            ->will($this->returnValue($fileMock));
+            ->with($this->isType('string'), null, $this->themeMock)
+            ->willReturn($fileMock);
 
-        $theme = new Theme(
-            $this->filesystemMock,
-            $this->fileFactoryMock
-        );
         // Only two files should be in array, which were returned from search
-        $this->assertEquals([$fileMock, $fileMock], $theme->getFiles($this->themeMock, 'css/*.test'));
+        $this->assertEquals(
+            [$fileMock, $fileMock],
+            $this->themeFileCollector->getFiles($this->themeMock, 'css/*.test')
+        );
     }
 }