Experimentally move commands.js and options.js to modules. Fix some bugs.

--HG--
branch : groups
rename : common/content/commands.js => common/modules/commands.jsm
rename : common/content/options.js => common/modules/options.jsm

common/tests/functional/testCommands.js

@@ -122,7 +122,17 @@ var tests = {
         singleOutput: ["", "foobar"],
         noOutput: ["foo bar", "-js bar baz"],
         multiOutput: [""],
-        error: ["foo bar", "-js bar baz"]
+        error: [
+            "foo bar",
+            "-js bar baz",
+            "-group=builtin baz quux",
+            "! -group=builtin baz quux",
+        ],
+        completions: [
+            ["", hasItems],
+            ["-group=", hasItems],
+            ["-group=user ", hasItems]
+        ]
     },
     comclear: {
         noOutput: [""]
@@ -140,6 +150,11 @@ var tests = {
     delcommand: [
         {
             init: ["comclear", "command foo bar"],
+            completions: [
+                ["", hasItems],
+                ["-group=", hasItems],
+                ["-group=user ", hasItems]
+            ],
             noOutput: ["foo"]
         },
         {
@@ -152,7 +167,6 @@ var tests = {
         noOutput: ["x"],
         completions: ["", "x"]
     },
-    delmapgroup: {}, // Skip for now
     get delmarks() this.delmacros,
     get delqmarks() this.delmacros,
     delstyle: {
@@ -233,6 +247,25 @@ var tests = {
     finish: { noOutput: [""] },
     forward: { noOutput: [""] },
     frameonly: { noOutput: [""] },
+    delgroup: {
+        error: ["builtin"],
+        completions: [""]
+    },
+    group: {
+        multiOutput: [""],
+        noOutput: [
+            "foo -d='foo group' -nopersist -l 'bar.com','http://bar/*','http://bar','^http:'",
+            "! foo -d='foo group' -nopersist -l 'bar.com','http://bar/*','http://bar','^http:'",
+            "foo",
+            "user"
+        ],
+        error: ["builtin"],
+        completions: [
+            "",
+            "foo "
+        ],
+        cleanup: ["delmapgroup foo"]
+    },
     hardcopy: {}, // Skip for now
     help: {
         noOutput: ["", "intro"],
@@ -318,7 +351,8 @@ var tests = {
         ],
         error: [
             "-mode=some-nonexistent-mode <C-a> <C-a>",
-            "-gtroup=some-nonexistent-group <C-a> <C-a>"
+            "-group=some-nonexistent-group <C-a> <C-a>",
+            "-group=builtin <C-a> <C-a>"
         ],
         completions: [
             ["", hasItems],
@@ -333,25 +367,13 @@ var tests = {
     },
     mapclear: {
         noOutput: [""],
-        completions: [""]
-    },
-    mapgroup: {
-        multiOutput: [""],
-        noOutput: [
-            "foo -d='foo group' -nopersist 'bar.com,http://bar/*,http://bar,^http:'",
-            "! foo -d='foo group' -nopersist 'bar.com,http://bar/*,http://bar,^http:'",
-            "foo",
-            "user"
-        ],
         error: [
-            "some-nonexistent-group",
-            "foo -d='foo group' -nopersist 'bar.com,http://bar/*,http://bar,^http:'"
+            "-group=builtin"
         ],
         completions: [
             "",
-            "foo "
-        ],
-        cleanup: ["delmapgroup foo"]
+            "-group="
+        ]
     },
     mark: {
         error: ["", "#", "xy"],