From 9b731d3a5811cce05001e1d8fbb0d53e2859c86b Mon Sep 17 00:00:00 2001 From: Solly Ross Date: Tue, 3 Jun 2014 17:42:28 -0400 Subject: [PATCH] Fix race condition in test runner Previously, there would be a case where if your tests took too long to run, the casper test runner would only report on certain tests. This has been fixed. --- tests/run_from_console.casper.js | 5 ++++- tests/run_from_console.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/run_from_console.casper.js b/tests/run_from_console.casper.js index 63b6b20d..7cb4b7c5 100644 --- a/tests/run_from_console.casper.js +++ b/tests/run_from_console.casper.js @@ -26,7 +26,10 @@ var provide_emitter = function(file_paths) { file_paths.forEach(function(file_path, path_ind) { spooky.thenOpen('file://'+file_path); - spooky.then([{ path_ind: path_ind }, function() { + spooky.waitFor(function() { + return this.getGlobal('__mocha_done') === true; + }, + [{ path_ind: path_ind }, function() { var res_json = { file_ind: path_ind }; diff --git a/tests/run_from_console.js b/tests/run_from_console.js index 06b40917..84ebd10a 100755 --- a/tests/run_from_console.js +++ b/tests/run_from_console.js @@ -68,7 +68,7 @@ if (program.autoInject) { var template = { header: "\n\n\n\n\n
", script_tag: function(p) { return ""; }, - footer: "\n\n" + footer: "\n\n" }; template.header += "\n" + template.script_tag(path.resolve(__dirname, 'node_modules/chai/chai.js'));