Merge pull request #1685 from smblott-github/fix-ui_component-race-condition

Fix UI-Component race condition on start up.

1 files changed, 17 insertions, 12 deletions

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