From 6b49dd27cb20ef5f830b1107b39480201796885d Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Tue, 26 May 2015 07:19:52 +0100
Subject: Refactor to avoid potential race condition.

I haven't seen this happen, but...

It could be possible for the iframe's contents to load before this
callback is called (on nextTick), in which case the "load" callback
wouldn't be called.  So we delay setting the iframe's source until
nextTick has elapsed.
---
 tests/dom_tests/phantom_runner.coffee | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'tests')

diff --git a/tests/dom_tests/phantom_runner.coffee b/tests/dom_tests/phantom_runner.coffee
index 93218724..e0382a35 100644
--- a/tests/dom_tests/phantom_runner.coffee
+++ b/tests/dom_tests/phantom_runner.coffee
@@ -37,15 +37,20 @@ page.open testfile, (status) ->
     console.log 'Unable to load tests.'
     phantom.exit 1
 
-  testsFailed = page.evaluate ->
-    Tests.run()
-    return Tests.testsFailed
-
-  if system.args[1] == '--coverage'
-    data = page.evaluate -> JSON.stringify _$jscoverage
-    fs.write dirname + 'dom_tests_coverage.json', data, 'w'
-
-  if testsFailed > 0
-    phantom.exit 1
-  else
-    phantom.exit 0
+  runTests = ->
+    testsFailed = page.evaluate ->
+      Tests.run()
+      return Tests.testsFailed
+
+    if system.args[1] == '--coverage'
+      data = page.evaluate -> JSON.stringify _$jscoverage
+      fs.write dirname + 'dom_tests_coverage.json', data, 'w'
+
+    if testsFailed > 0
+      phantom.exit 1
+    else
+      phantom.exit 0
+
+  # We add a short delay to allow asynchronous initialization (that is, initialization which happens on
+  # "nextTick") to complete.
+  setTimeout runTests, 10
-- 
cgit v1.2.3