MAGETWO-33622: Junior+ Developer Workflow

- fix tests

Author: Pavlo Cherniavskyi

dev/tests/unit/testsuite/Magento/Framework/App/View/Asset/MaterializationStrategy/SymlinkTest.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Framework\App\View\Asset\MaterializationStrategy;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\View\Asset;
 
 class SymlinkTest extends \PHPUnit_Framework_TestCase
@@ -61,7 +62,7 @@ public function sourceFileDataProvider()
     {
         return [
             ['path/to/file', true],
-            [Asset\Source::TMP_MATERIALIZATION_DIR . '/path/to/file', false]
+            [DirectoryList::TMP_MATERIALIZATION_DIR . '/path/to/file', false]
         ];
     }
 }

dev/tests/unit/testsuite/Magento/Framework/Less/FileGeneratorTest.php

@@ -79,7 +79,7 @@ public function testGenerateLessFileTree()
         $expectedPath = '/var/view_preprocessed/less/some/file.less';
 
         $asset = $this->getMock('\Magento\Framework\View\Asset\File', [], [], '', false);
-        $asset->expects($this->once())
+        $asset->expects($this->exactly(2))
             ->method('getPath')
             ->will($this->returnValue('some/file.css'));
         $chain = new \Magento\Framework\View\Asset\PreProcessor\Chain($asset, $originalContent, 'less');

lib/internal/Magento/Framework/View/Asset/PreProcessor/Chain.php

@@ -53,12 +53,14 @@ class Chain
      * @param \Magento\Framework\View\Asset\LocalInterface $asset
      * @param string $origContent
      * @param string $origContentType
+     * @param null $origAssetPath
+     * @param string $appMode
      */
     public function __construct(
         \Magento\Framework\View\Asset\LocalInterface $asset,
         $origContent,
         $origContentType,
-        $origPath,
+        $origAssetPath =  null,
         $appMode = \Magento\Framework\App\State::MODE_DEFAULT
     ) {
         $this->asset = $asset;
@@ -67,13 +69,12 @@ public function __construct(
         $this->origContentType = $origContentType;
         $this->contentType = $origContentType;
         $this->appMode = $appMode;
+        $this->targetContentType = $asset->getContentType();
+        $this->targetAssetPath = $asset->getPath();
 
         if ($appMode == \Magento\Framework\App\State::MODE_DEVELOPER) {
             $this->targetContentType = $this->origContentType;
-            $this->targetAssetPath = $origPath;
-        } else {
-            $this->targetContentType = $asset->getContentType();
-            $this->targetAssetPath = $asset->getPath();
+            $this->targetAssetPath = $origAssetPath;
         }
     }