Import r6923 from upstream hg supporting Firefox up to 22.0a1

[dactyl.git] / common / tests / functional / testCommands.js

diff --git a/common/tests/functional/testCommands.js b/common/tests/functional/testCommands.js
index 010919cb5791252bc4e042537465beaf9ed5be07..2f986259556b4c1d8333ab7b49dd262bbd444093 100644 (file)
--- a/common/tests/functional/testCommands.js
+++ b/common/tests/functional/testCommands.js
@@ -474,21 +474,13 @@ var tests = {
         completions: [""],
         cleanup: ["silent !rm some-nonexistent-rc.penta"]
     },
-    mksyntax: {
-        noOutput: [
-            "some-nonexistent-pentadactyl-dir/",
-            "! some-nonexistent-pentadactyl-dir/",
-            "some-nonexistent-pentadactyl-dir/foo.vim",
-            "! some-nonexistent-pentadactyl-dir/foo.vim",
-        ],
+    mkvimruntime: {
         error: [
-            "some-nonexistent-pentadactyl-dir/",
-            "some-nonexistent-pentadactyl-dir/foo.vim"
+            "some-nonexistent-pentadactyl-dir/"
         ],
         completions: [
             ["", hasItems]
-        ],
-        cleanup: ["silent !rm -r some-nonexistent-pentadactyl-dir/"]
+        ]
     },
     get mlistkeys() this.listcommands,
     mmap: {},
@@ -835,7 +827,6 @@ var tests = {
     time: {
         error: ["", ":some-nonexistent-command"/*, "some_nonexistent_reference"*/], // FIXME
         singleOutput: [":js null", "null"]
-
     },
     get tlistkeys() this.listcommands,
     tmap: {},
@@ -911,7 +902,7 @@ var tests = {
         error: ["foo"],
         multiOutput: [
             ["", function (msg) {
-                var res = /(\w+dactyl) (\S+) \(([\^)]+)\) running on:\nMozilla/;
+                var res = /(\w+dactyl) (\S+) \(([\^)]+)\) running on:\nMozilla/.exec(msg);
                 return res && res[2] != "null" && res[3] != "null";
             }]
         ]