Merge branch 'MAGETWO-64587' of github.com:magento-troll/magento2ce into MAGETWO-62334

Author: slopukhov

app/code/Magento/Catalog/Model/View/Asset/Image.php

@@ -95,7 +95,7 @@ public function getContentType()
      */
     public function getPath()
     {
-        return $this->getRelativePath($this->context->getPath());
+        return $this->getAbsolutePath($this->context->getPath());
     }
 
     /**
@@ -175,6 +175,21 @@ private function getMiscPath()
         return $this->encryptor->hash(implode('_', $this->miscParams), Encryptor::HASH_VERSION_MD5);
     }
 
+    /**
+     * Generate absolute path
+     *
+     * @param string $result
+     * @return string
+     */
+    private function getAbsolutePath($result)
+    {
+        $prefix = (substr($result, 0, 1) == DIRECTORY_SEPARATOR) ? DIRECTORY_SEPARATOR : '';
+        $result = $this->join($result, $this->getModule());
+        $result = $this->join($result, $this->getMiscPath());
+        $result = $this->join($result, $this->getFilePath());
+        return $prefix . $result;
+    }
+
     /**
      * Generate relative path
      *

app/code/Magento/Catalog/Test/Unit/Model/View/Asset/ImageTest.php

@@ -97,6 +97,30 @@ public function testGetPath($filePath, $miscParams)
         );
     }
 
+    /**
+     * @param string $filePath
+     * @param array $miscParams
+     * @dataProvider getPathDataProvider
+     */
+    public function testGetNotUnixPath($filePath, $miscParams)
+    {
+        $imageModel = new Image(
+            $this->mediaConfig,
+            $this->imageContext,
+            $this->encryptor,
+            $filePath,
+            $miscParams
+        );
+        $absolutePath = 'C:\www\magento2ce\pub\media\catalog\product';
+        $hashPath = md5(implode('_', $miscParams));
+        $this->imageContext->expects($this->once())->method('getPath')->willReturn($absolutePath);
+        $this->encryptor->expects($this->once())->method('hash')->willReturn($hashPath);
+        $this->assertEquals(
+            $absolutePath . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR . $hashPath . $filePath,
+            $imageModel->getPath()
+        );
+    }
+
     /**
      * @param string $filePath
      * @param array $miscParams