2 files changed, 19 insertions, 23 deletions
diff --git a/tests/unit_tests/commands_test.coffee b/tests/unit_tests/commands_test.coffee
index 0e0be1d6..49dd2570 100644
--- a/tests/unit_tests/commands_test.coffee
+++ b/tests/unit_tests/commands_test.coffee
@@ -4,6 +4,14 @@ extend global, require "../../background_scripts/bg_utils.js"
 global.Settings = {postUpdateHooks: {}, get: (-> ""), set: ->}
 {Commands} = require "../../background_scripts/commands.js"
 
+# Include mode_normal to check that all commands have been implemented.
+global.KeyHandlerMode = global.Mode = {}
+global.KeyboardUtils = {platform: ""}
+extend global, require "../../content_scripts/link_hints.js"
+extend global, require "../../content_scripts/marks.js"
+extend global, require "../../content_scripts/vomnibar.js"
+{NormalModeCommands} = require "../../content_scripts/mode_normal.js"
+
 context "Key mappings",
   setup ->
     @testKeySequence = (key, expectedKeyText, expectedKeyLength) ->
@@ -114,6 +122,14 @@ context "Parse commands",
     assert.equal "a", BgUtils.parseLines("  a  \n  b")[0]
     assert.equal "b", BgUtils.parseLines("  a  \n  b")[1]
 
-# TODO (smblott) More tests:
-# - Ensure each background command has an implmentation in BackgroundCommands
-# - Ensure each foreground command has an implmentation in vimium_frontent.coffee
+context "Commands implemented",
+  (for own command, options of Commands.availableCommands
+    do (command, options) ->
+      if options.background
+        should "#{command} (background command)", ->
+          # TODO: Import background_scripts/main.js and expose BackgroundCommands from there.
+          # assert.isTrue BackgroundCommands[command]
+      else
+        should "#{command} (foreground command)", ->
+          assert.isTrue NormalModeCommands[command]
+  )...
diff --git a/tests/unit_tests/utils_test.coffee b/tests/unit_tests/utils_test.coffee
index cc1081dd..2794a6d7 100644
--- a/tests/unit_tests/utils_test.coffee
+++ b/tests/unit_tests/utils_test.coffee
@@ -138,26 +138,6 @@ context "distinctCharacters",
   should "eliminate duplicate characters", ->
     assert.equal "abc", Utils.distinctCharacters "bbabaabbacabbbab"
 
-context "invokeCommandString",
-  setup ->
-    @beenCalled = false
-    window.singleComponentCommand = => @beenCalled = true
-    window.twoComponentCommand = command: window.singleComponentCommand
-
-  tearDown ->
-    delete window.singleComponentCommand
-    delete window.twoComponentCommand
-
-  should "invoke single-component commands", ->
-    assert.isFalse @beenCalled
-    Utils.invokeCommandString "singleComponentCommand"
-    assert.isTrue @beenCalled
-
-  should "invoke multi-component commands", ->
-    assert.isFalse @beenCalled
-    Utils.invokeCommandString "twoComponentCommand.command"
-    assert.isTrue @beenCalled
-
 context "escapeRegexSpecialCharacters",
   should "escape regexp special characters", ->
     str = "-[]/{}()*+?.^$|"