From 6073cafed845cd31f88c5b51aafacc44278245fb Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Tue, 28 Apr 2015 10:46:23 +0100
Subject: Temporary fix for tests.

The tests are passing, but they are triggering an exception in the
initialization of the HUD.  It's proving difficult to get the
initialization in the right order for both the tests and live.

This is a temporary fix...
---
 content_scripts/vimium_frontend.coffee | 2 +-
 tests/dom_tests/dom_tests.coffee       | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 447f7cc1..a21beb27 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -232,7 +232,7 @@ window.installListeners = ->
     installedListeners = true
     # Other one-time initialization operations.
     FindModeHistory.init()
-    new GrabBackFocus if isEnabledForUrl
+    new GrabBackFocus if isEnabledForUrl and not runningDOMTests
 
 #
 # Whenever we get the focus:
diff --git a/tests/dom_tests/dom_tests.coffee b/tests/dom_tests/dom_tests.coffee
index bb09a0a8..d6c3bfa2 100644
--- a/tests/dom_tests/dom_tests.coffee
+++ b/tests/dom_tests/dom_tests.coffee
@@ -1,4 +1,8 @@
 
+# FIXME(smblott) Getting everything initialized in the right order for both tests and live operation is
+# proving difficult.  Until we can figure it out, we tell the front end that we're running the DOM tests.
+window.runningDOMTests = true
+
 # Install frontend event handlers.
 installListeners()
 
-- 
cgit v1.2.3