Fix for windows pats in exclude and include

monounity · Nov 7, 2016 · 2ca5747 · 2ca5747
1 parent f6550e4
commit 2ca5747
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/lib/framework.js b/lib/framework.js
@@ -98,8 +98,8 @@ function Framework(bundler, compiler) {
 
         var tsconfig;
 
-        extend("include", karmaTypescriptConfig, configFileJson.config);
-        extend("exclude", karmaTypescriptConfig, configFileJson.config);
+        extend("include", configFileJson.config, karmaTypescriptConfig);
+        extend("exclude", configFileJson.config, karmaTypescriptConfig);
 
         if(ts.parseConfigFile) {
 
@@ -128,10 +128,17 @@ function Framework(bundler, compiler) {
         var list = union(a[key], b[key]);
 
         if(list && list.length) {
-            b[key] = list;
+
+            a[key] = list.map(function(item){
+                return fixWindowsPath(item);
+            });
         }
     }
 
+    function fixWindowsPath(value) {
+        return value.replace(/\\/g, "/");
+    }
+
     function convertOptions(options) {
 
         if(options) {