Merge pull request #46 from Hypercubed/fix-windows

etpinard · etpinard · commit e210f41309d0 · 2015-11-30T10:25:27.000-05:00
Fix test-jasmine on windows
diff --git a/package.json b/package.json
@@ -85,7 +85,7 @@
     "jasmine-core": "^2.3.4",
     "jshint": "^2.8.0",
     "karma": "^0.13.15",
-    "karma-browserify": "^4.4.0",
+    "karma-browserify": "^4.4.1",
     "karma-chrome-launcher": "^0.2.1",
     "karma-coverage": "^0.5.3",
     "karma-firefox-launcher": "^0.1.6",
diff --git a/tasks/util/shortcut_paths.js b/tasks/util/shortcut_paths.js
@@ -22,7 +22,8 @@ module.exports = transformTools.makeRequireTransform('requireTransform',
         Object.keys(shortcutsConfig).forEach(function(k) {
             if(pathIn.indexOf(k) !== -1) {
                 var tail = pathIn.split(k)[1];
-                pathOut = 'require(\''+ shortcutsConfig[k] + tail + '\')';
+                var newPath = path.join(shortcutsConfig[k], tail).replace(/\\/g, '/');
+                pathOut = 'require(\''+ newPath + '\')';
             }
         });
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@ module.exports = transformTools.makeRequireTransform('requireTransform',`
`22`	`22`	`Object.keys(shortcutsConfig).forEach(function(k) {`
`23`	`23`	`if(pathIn.indexOf(k) !== -1) {`
`24`	`24`	`var tail = pathIn.split(k)[1];`
`25`		`- pathOut = 'require(\''+ shortcutsConfig[k] + tail + '\')';`
	`25`	`+ var newPath = path.join(shortcutsConfig[k], tail).replace(/\\/g, '/');`
	`26`	`+ pathOut = 'require(\''+ newPath + '\')';`
`26`	`27`	`}`
`27`	`28`	`});`
`28`	`29`