Merge branch 'MAGETWO-51185' of https://github.corp.magento.com/magento-tango/magento2ce into MAGETWO-52212

Author: shiftedreality

lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/Resolver/MinificationTest.php

@@ -99,4 +99,82 @@ public function resolveDataProvider()
             [false, 'file.min.css', 'file.min.css', false, false, 'found.css']
         ];
     }
+
+    public function testResolveJs()
+    {
+        $this->resolverMock
+            ->expects($this->once())
+            ->method('resolve')
+            ->willReturn('/var/test.min.js');
+        $this->assetMinificationMock->expects($this->once())
+            ->method('isMinifiedFilename')
+            ->willReturn(true);
+
+        $this->assertEquals('/var/test.min.js', $this->minification->resolve('', 'test.min.js'));
+    }
+
+    public function testResolveJsWithDisabledMinification()
+    {
+        $this->resolverMock
+            ->expects($this->once())
+            ->method('resolve')
+            ->willReturn('/var/test.js');
+        $this->assetMinificationMock->expects($this->once())
+            ->method('isMinifiedFilename')
+            ->willReturn(false);
+
+        $this->assertEquals('/var/test.js', $this->minification->resolve('', 'test.js'));
+    }
+
+    public function testResolveJsToFindMinifiedVersion()
+    {
+        $this->resolverMock
+            ->expects($this->exactly(2))
+            ->method('resolve')
+            ->willReturnMap(
+                [
+                    ['', 'test.js', null, null, null, null, '/var/test.js'],
+                    ['', 'test.min.js', null, null, null, null, '/var/test.min.js']
+                ]
+            );
+        $this->assetMinificationMock->expects($this->once())
+            ->method('isMinifiedFilename')
+            ->willReturn(false);
+        $this->assetMinificationMock->expects($this->once())
+            ->method('isEnabled')
+            ->with('js')
+            ->willReturn(true);
+        $this->assetMinificationMock->expects($this->once())
+            ->method('addMinifiedSign')
+            ->with('test.js')
+            ->willReturn('test.min.js');
+
+        $this->assertEquals('/var/test.min.js', $this->minification->resolve('', 'test.js'));
+    }
+
+    public function testResolveJsToNotFindMinifiedVersion()
+    {
+        $this->resolverMock
+            ->expects($this->exactly(2))
+            ->method('resolve')
+            ->willReturnMap(
+                [
+                    ['', 'test.js', null, null, null, null, '/var/test.js'],
+                    ['', 'test.min.js', null, null, null, null, false]
+                ]
+            );
+        $this->assetMinificationMock->expects($this->once())
+            ->method('isMinifiedFilename')
+            ->willReturn(false);
+        $this->assetMinificationMock->expects($this->once())
+            ->method('isEnabled')
+            ->with('js')
+            ->willReturn(true);
+        $this->assetMinificationMock->expects($this->once())
+            ->method('addMinifiedSign')
+            ->with('test.js')
+            ->willReturn('test.min.js');
+
+        $this->assertEquals('/var/test.js', $this->minification->resolve('', 'test.js'));
+    }
 }