fix(init): issue computmaxer#162

m-a-r-c-e-l-i-n-o · Jul 9, 2016 · d0aa8c4 · d0aa8c4
1 parent 284ccd9
commit d0aa8c4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/init.js b/src/init.js
@@ -102,13 +102,13 @@ module.exports = function(files, basePath, jspm, client, emitter) {
             return packagesPath + fileName + '.js';
         }
     }
-    
+
     Array.prototype.unshift.apply(files,
         configPaths.map(function(configPath) {
             return createPattern(configPath)
         })
     );
-    
+
     // Needed for JSPM 0.17 beta
     if(jspm.browser) {
         files.unshift(createPattern(browserPath));
@@ -139,7 +139,9 @@ module.exports = function(files, basePath, jspm, client, emitter) {
 
     // Allow Karma to serve all files within jspm_packages.
     // This allows jspm/SystemJS to load them
-    var jspmPattern = createServedPattern(packagesPath + '**/*', {nocache: jspm.cachePackages !== true});
+    var jspmPattern = createServedPattern(
+        packagesPath + '!(system-polyfills.src.js|system.src.js)/**', {nocache: jspm.cachePackages !== true}
+    );
     jspmPattern.watched = false;
     files.push(jspmPattern);
 };
diff --git a/test/testInit.spec.js b/test/testInit.spec.js
@@ -74,7 +74,7 @@ describe('jspm plugin init', function(){
     });
 
     it('should use the configured jspm_packages path and include it at the end of the files array', function(){
-        expect(normalPath(files[files.length - 1].pattern)).toEqual(normalPath(path.resolve(cwd, './custom_packages/**/*')));
+        expect(normalPath(files[files.length - 1].pattern)).toEqual(normalPath(path.resolve(cwd, './custom_packages/!(system-polyfills.src.js|system.src.js)/**')));
         expect(files[files.length - 1].included).toEqual(false);
         expect(files[files.length - 1].served).toEqual(true);
         expect(files[files.length - 1].watched).toEqual(false);