Merge pull request #2151 from magento-thunder/MAGETWO-84507

Yevhen Miroshnychenko · web-flow · commit dcd8bcbfb7a4 · 2018-03-05T21:52:35.000+02:00
Fixed issues:
- MAGETWO-84507: JS merging fails when JS bundling is enabled and bundle folder contains any other files
diff --git a/app/code/Magento/RequireJs/Model/FileManager.php b/app/code/Magento/RequireJs/Model/FileManager.php
@@ -183,6 +183,9 @@ public function createBundleJsPool()
             }
 
             foreach ($libDir->read($bundleDir) as $bundleFile) {
+                if (pathinfo($bundleFile, PATHINFO_EXTENSION) !== 'js') {
+                    continue;
+                }
                 $relPath = $libDir->getRelativePath($bundleFile);
                 $bundles[] = $this->assetRepo->createArbitrary($relPath, '');
             }
diff --git a/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php b/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
@@ -153,7 +153,7 @@ public function testCreateBundleJsPool()
             ->expects($this->once())
             ->method('read')
             ->with('path/to/bundle/dir/js/bundle')
-            ->willReturn(['bundle1.js', 'bundle2.js']);
+            ->willReturn(['bundle1.js', 'bundle2.js', 'some_file.not_js']);
         $dirRead
             ->expects($this->exactly(2))
             ->method('getRelativePath')

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,9 @@ public function createBundleJsPool()`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`foreach ($libDir->read($bundleDir) as $bundleFile) {`
	`186`	`+ if (pathinfo($bundleFile, PATHINFO_EXTENSION) !== 'js') {`
	`187`	`+ continue;`
	`188`	`+ }`
`186`	`189`	`$relPath = $libDir->getRelativePath($bundleFile);`
`187`	`190`	`$bundles[] = $this->assetRepo->createArbitrary($relPath, '');`
`188`	`191`	`}`