Bug 1271777 - Fix the 'MacCtr' typo in the commands API r?kmag draft
authorMatthew Wein <mwein@mozilla.com>
Tue, 24 May 2016 15:02:10 -0700
changeset 370539 d18642088206499e707071c51f937abcd293c9a5
parent 365485 c2baefa3c7c662e67ff32aac1743ed1a6ed5df8a
child 521777 e35a0ed00e62964c114535933883da5c40f95d11
push id19092
push usermwein@mozilla.com
push dateTue, 24 May 2016 22:33:02 +0000
reviewerskmag
bugs1271777
milestone49.0a1
Bug 1271777 - Fix the 'MacCtr' typo in the commands API r?kmag MozReview-Commit-ID: A4cgnrecZ1d
browser/components/extensions/test/browser/browser_ext_commands_onCommand.js
--- a/browser/components/extensions/test/browser/browser_ext_commands_onCommand.js
+++ b/browser/components/extensions/test/browser/browser_ext_commands_onCommand.js
@@ -11,16 +11,31 @@ add_task(function* test_user_defined_com
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "commands": {
         "toggle-feature-using-alt-shift-3": {
           "suggested_key": {
             "default": "Alt+Shift+3",
           },
         },
+        "toggle-feature-using-control-shift-4": {
+          "suggested_key": {
+            "default": "Ctrl+Shift+4",
+          },
+        },
+        "toggle-feature-using-control-page-up": {
+          "suggested_key": {
+            "default": "Ctrl+PageUp",
+          },
+        },
+        "toggle-feature-using-mac-control-5": {
+          "suggested_key": {
+            "default": "MacCtrl+5",
+          },
+        },
         "toggle-feature-using-alt-shift-comma": {
           "suggested_key": {
             "default": "Alt+Shift+Comma",
           },
           "unrecognized_property": "with-a-random-value",
         },
         "toggle-feature-with-whitespace-in-suggested-key": {
           "suggested_key": {
@@ -53,28 +68,40 @@ add_task(function* test_user_defined_com
   let win2 = yield BrowserTestUtils.openNewBrowserWindow();
   yield BrowserTestUtils.loadURI(win2.gBrowser.selectedBrowser, "about:config");
   yield BrowserTestUtils.browserLoaded(win2.gBrowser.selectedBrowser);
 
   // Confirm the keysets have been added to both windows.
   let keysetID = `ext-keyset-id-${makeWidgetId(extension.id)}`;
   let keyset = win1.document.getElementById(keysetID);
   ok(keyset != null, "Expected keyset to exist");
-  is(keyset.childNodes.length, 3, "Expected keyset to have 3 children");
+  is(keyset.childNodes.length, 6, "Expected keyset to have 3 children");
 
   keyset = win2.document.getElementById(keysetID);
   ok(keyset != null, "Expected keyset to exist");
-  is(keyset.childNodes.length, 3, "Expected keyset to have 3 children");
+  is(keyset.childNodes.length, 6, "Expected keyset to have 3 children");
 
   // Confirm that the commands are registered to both windows.
   yield focusWindow(win1);
   EventUtils.synthesizeKey("3", {altKey: true, shiftKey: true});
   let message = yield extension.awaitMessage("oncommand");
   is(message, "toggle-feature-using-alt-shift-3", "Expected onCommand listener to fire with correct message");
 
+  EventUtils.synthesizeKey("4", {accelKey: true, shiftKey: true});
+  message = yield extension.awaitMessage("oncommand");
+  is(message, "toggle-feature-using-control-shift-4", "Expected onCommand listener to fire with correct message");
+
+  EventUtils.synthesizeKey("VK_PAGE_UP", {accelKey: true});
+  message = yield extension.awaitMessage("oncommand");
+  is(message, "toggle-feature-using-control-page-up", "Expected onCommand listener to fire with correct message");
+
+  EventUtils.synthesizeKey("5", {ctrlKey: true});
+  message = yield extension.awaitMessage("oncommand");
+  is(message, "toggle-feature-using-mac-control-5", "Expected onCommand listener to fire with correct message");
+
   yield focusWindow(win2);
   EventUtils.synthesizeKey("VK_COMMA", {altKey: true, shiftKey: true});
   message = yield extension.awaitMessage("oncommand");
   is(message, "toggle-feature-using-alt-shift-comma", "Expected onCommand listener to fire with correct message");
 
   EventUtils.synthesizeKey("2", {altKey: true, shiftKey: true});
   message = yield extension.awaitMessage("oncommand");
   is(message, "toggle-feature-with-whitespace-in-suggested-key", "Expected onCommand listener to fire with correct message");