From 97e61e29d59b9557fe1fb8d7ae1a34be1d47fcc1 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Mon, 19 Jan 2015 05:39:24 +0000
Subject: Rework DOM tests.

- Set up modes such that they can be re-initialised.
- Move initialisation of BadgeMode to general initialisation function.
- Add reset() method for handlerStack.
- Consistently use  initializeModeState() in all tests' setup().
- Refactor focusInput tests.
- Add some more tests.
- Simplify some other tests.

Note: Clean-up of the inputFocus overlay now happens when the exit()
method is called in Mode.reset().  This eliminates most needs to
artificially bubble a keyboard event to clear the overlay.
---
 content_scripts/mode.coffee | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'content_scripts/mode.coffee')

diff --git a/content_scripts/mode.coffee b/content_scripts/mode.coffee
index acc3978e..42ea9930 100644
--- a/content_scripts/mode.coffee
+++ b/content_scripts/mode.coffee
@@ -169,14 +169,19 @@ class Mode
   log: (args...) ->
     console.log args... if @debug
 
-  # Return the must-recently activated mode (only used in tests).
+  # For tests only.
   @top: ->
     @modes[@modes.length-1]
 
+  # For tests only.
+  @reset: ->
+    mode.exit() for mode in @modes
+    @modes = []
+
 # BadgeMode is a pseudo mode for triggering badge updates on focus changes and state updates. It sits at the
 # bottom of the handler stack, and so it receives state changes *after* all other modes, and can override the
-# badge choice of the other modes.  We create the the one-and-only instance here.
-new class BadgeMode extends Mode
+# badge choice of the other modes.
+class BadgeMode extends Mode
   constructor: () ->
     super
       name: "badge"
@@ -200,3 +205,4 @@ new class BadgeMode extends Mode
 
 root = exports ? window
 root.Mode = Mode
+root.BadgeMode = BadgeMode
-- 
cgit v1.2.3