Merge branch 'MAGETWO-37504-st-compiler' into develop

Author: Dale Sikkema

setup/src/Magento/Setup/Console/Command/DiCompileCommand.php

@@ -40,7 +40,7 @@ class DiCompileCommand extends Command
 
     /** @var array */
     private $excludedPathsList;
-    
+
     /**
      * Constructor
      *

setup/src/Magento/Setup/Test/Unit/Console/Command/DiCompileCommandTest.php

@@ -10,26 +10,24 @@
 
 class DiCompileCommandTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @var \Magento\Framework\App\DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
-     */
+    /** @var \Magento\Framework\App\DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject */
     private $deploymentConfig;
 
-    /**
-     * @var \Magento\Setup\Module\Di\App\Task\Manager|\PHPUnit_Framework_MockObject_MockObject
-     */
+    /** @var \Magento\Setup\Module\Di\App\Task\Manager|\PHPUnit_Framework_MockObject_MockObject */
     private $manager;
 
-    /**
-     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
+    /** @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     private $objectManager;
 
-    /**
-     * @var DiCompileCommand
-     */
+    /** @var DiCompileCommand|\PHPUnit_Framework_MockObject_MockObject */
     private $command;
 
+    /** @var  \Magento\Framework\App\Cache|\PHPUnit_Framework_MockObject_MockObject */
+    private $cacheMock;
+
+    /** @var  \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject */
+    private $filesystem;
+
     public function setUp()
     {
         $this->deploymentConfig = $this->getMock('Magento\Framework\App\DeploymentConfig', [], [], '', false);
@@ -46,15 +44,22 @@ public function setUp()
             '',
             false
         );
+        $this->cacheMock = $this->getMockBuilder('Magento\Framework\App\Cache')
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $objectManagerProvider->expects($this->once())->method('get')->willReturn($this->objectManager);
         $this->manager = $this->getMock('Magento\Setup\Module\Di\App\Task\Manager', [], [], '', false);
         $directoryList = $this->getMock('Magento\Framework\App\Filesystem\DirectoryList', [], [], '', false);
+        $this->filesystem = $this->getMockBuilder('Magento\Framework\Filesystem')->disableOriginalConstructor()->getMock();
+
         $directoryList->expects($this->exactly(3))->method('getPath');
         $this->command = new DiCompileCommand(
             $this->deploymentConfig,
             $directoryList,
             $this->manager,
-            $objectManagerProvider
+            $objectManagerProvider,
+            $this->filesystem
         );
     }
 
@@ -71,6 +76,15 @@ public function testExecuteNotInstalled()
 
     public function testExecute()
     {
+        $this->objectManager->expects($this->once())
+            ->method('get')
+            ->with('Magento\Framework\App\Cache')
+            ->willReturn($this->cacheMock);
+        $this->cacheMock->expects($this->once())->method('clean');
+        $writeDirectory = $this->getMock('Magento\Framework\Filesystem\Directory\WriteInterface');
+        $writeDirectory->expects($this->atLeastOnce())->method('delete');
+        $this->filesystem->expects($this->atLeastOnce())->method('getDirectoryWrite')->willReturn($writeDirectory);
+
         $this->deploymentConfig->expects($this->once())->method('isAvailable')->willReturn(true);
         $this->objectManager->expects($this->once())->method('configure');
         $this->manager->expects($this->exactly(6))->method('addOperation');