Fixes bug were the tests would never be run

jauco · Feb 26, 2014 · 139019b · 139019b
1 parent f76a3d9
commit 139019b
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 35 deletions.
diff --git a/src/lib/createTestFile.js b/src/lib/createTestFile.js
@@ -31,7 +31,7 @@ module.exports = function createTestFile(filenames, karmaPath, cb) {
                     jQuery: "jquery"
                 })
             ]
-        }, require("./handleWebpackResult"));
+        }, require("./handleWebpackResult")(cb));
     } catch (e) {
         console.log(e, e.stack);
     }

diff --git a/src/lib/handleWebpackResult.js b/src/lib/handleWebpackResult.js
@@ -1,37 +1,42 @@
-module.exports = function handleWebpackResult(err, stats) {
-    if (stats) {
-        stats = stats.toJson();
-    }
-    var nonFatalErrors = (stats && stats.errors) || [];
-    var warnings = (stats && stats.warnings) || [];
-    if (err || nonFatalErrors.length > 0 || warnings.length > 0) {
-        console.error("Something went wrong while generating the test file");
-        if (err) {
-            console.log("Fatal error:");
-            console.log("  ", err);
+module.exports = function createHandleWebpackResult(cb) {
+    return function handleWebpackResult(err, stats) {
+        if (stats) {
+            stats = stats.toJson();
         }
-        if (nonFatalErrors.length > 0) {
-            console.log("Non-fatal error" + (nonFatalErrors.length > 1 ? "s" : "") + ":");
-            nonFatalErrors.forEach(function (err) {
-                err.split("\n").forEach(function (err) {
-                    console.log("    ", err); 
-                })
-            }); 
-        }
-        if (warnings.length > 0) {
-            console.log("Warning" + (nonFatalErrors.length > 1 ? "s" : "") + ":");
-            warnings.forEach(function (err) { 
-                err.split("\n").forEach(function (err) {
-                    console.log("    ", err); 
-                })
-            }); 
-        }
-        if (err) {
-            console.error("Building failed!");
+        var nonFatalErrors = (stats && stats.errors) || [];
+        var warnings = (stats && stats.warnings) || [];
+        if (err || nonFatalErrors.length > 0 || warnings.length > 0) {
+            console.error("Something went wrong while generating the test file");
+            if (err) {
+                console.log("Fatal error:");
+                console.log("  ", err);
+            }
+            if (nonFatalErrors.length > 0) {
+                console.log("Non-fatal error" + (nonFatalErrors.length > 1 ? "s" : "") + ":");
+                nonFatalErrors.forEach(function (err) {
+                    err.split("\n").forEach(function (err) {
+                        console.log("    ", err); 
+                    })
+                }); 
+            }
+            if (warnings.length > 0) {
+                console.log("Warning" + (nonFatalErrors.length > 1 ? "s" : "") + ":");
+                warnings.forEach(function (err) { 
+                    err.split("\n").forEach(function (err) {
+                        console.log("    ", err); 
+                    })
+                }); 
+            }
+            if (err) {
+                console.error("Building failed!");
+                cb(false);
+            } else {
+                console.error("Building finished, but the result might not work!");
+                cb(true);
+            }
         } else {
-            console.error("Building finished, but the result might not work!");
+            console.log("Building succeeded!");
+            cb(true);
         }
-    } else {
-        console.log("Building succeeded!");
-    }
+    };
 };
diff --git a/src/lib/rebuildProject.js b/src/lib/rebuildProject.js
@@ -34,7 +34,7 @@ module.exports = function rebuildProject(entryGlob, artifactPath) {
                         jQuery: "jquery"
                     })
                 ]
-            }, require("./handleWebpackResult"));
+            }, require("./handleWebpackResult")(function () {}));
         });
     });
 };