Bug 1334418 - Enable full tab focus on OSX in identityBlock_focus tests. r=Gijs draft
authorJohann Hofmann <jhofmann@mozilla.com>
Tue, 31 Jan 2017 22:44:14 +0100
changeset 468942 c48e57c6efe285163f376f54f7b6b7591b1e72bc
parent 468498 ee975d32deb9eaa5641f45428cd6a4b5b555a8f5
child 544065 4bc2231529dac22856465dd80beb17a822d67992
push id43587
push userbmo:jhofmann@mozilla.com
push dateWed, 01 Feb 2017 10:52:03 +0000
reviewersGijs
bugs1334418
milestone54.0a1
Bug 1334418 - Enable full tab focus on OSX in identityBlock_focus tests. r=Gijs MozReview-Commit-ID: 54ieeV15tDq
browser/base/content/test/siteIdentity/browser.ini
browser/base/content/test/siteIdentity/browser_identityBlock_focus.js
--- a/browser/base/content/test/siteIdentity/browser.ini
+++ b/browser/base/content/test/siteIdentity/browser.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
 support-files =
   head.js
 
 [browser_identityBlock_focus.js]
-skip-if = os == 'mac' # Bug 1334418 (try only)
 support-files = ../general/permissions.html
--- a/browser/base/content/test/siteIdentity/browser_identityBlock_focus.js
+++ b/browser/base/content/test/siteIdentity/browser_identityBlock_focus.js
@@ -9,29 +9,30 @@ function synthesizeKeyAndWaitForFocus(el
   let focused = BrowserTestUtils.waitForEvent(element, "focus");
   EventUtils.synthesizeKey(keyCode, options);
   return focused;
 }
 
 // Checks that the identity block is the next element after the urlbar
 // to be focused if there are no active notification anchors.
 add_task(function* testWithoutNotifications() {
+  yield SpecialPowers.pushPrefEnv({"set": [["accessibility.tabfocus", 7]]});
   yield BrowserTestUtils.withNewTab("https://example.com", function*() {
     yield synthesizeKeyAndWaitForFocus(gURLBar, "l", {accelKey: true})
     is(document.activeElement, gURLBar.inputField, "urlbar should be focused");
     yield synthesizeKeyAndWaitForFocus(gIdentityHandler._identityBox, "VK_TAB", {shiftKey: true})
     is(document.activeElement, gIdentityHandler._identityBox,
        "identity block should be focused");
   });
 });
 
 // Checks that when there is a notification anchor, it will receive
 // focus before the identity block.
 add_task(function* testWithoutNotifications() {
-
+  yield SpecialPowers.pushPrefEnv({"set": [["accessibility.tabfocus", 7]]});
   yield BrowserTestUtils.withNewTab(PERMISSIONS_PAGE, function*(browser) {
     let popupshown = BrowserTestUtils.waitForEvent(PopupNotifications.panel, "popupshown");
     // Request a permission;
     BrowserTestUtils.synthesizeMouseAtCenter("#geo", {}, browser);
     yield popupshown;
 
     yield synthesizeKeyAndWaitForFocus(gURLBar, "l", {accelKey: true})
     is(document.activeElement, gURLBar.inputField, "urlbar should be focused");
@@ -41,16 +42,17 @@ add_task(function* testWithoutNotificati
     yield synthesizeKeyAndWaitForFocus(gIdentityHandler._identityBox, "VK_TAB", {shiftKey: true})
     is(document.activeElement, gIdentityHandler._identityBox,
        "identity block should be focused");
   });
 });
 
 // Checks that with invalid pageproxystate the identity block is ignored.
 add_task(function* testInvalidPageProxyState() {
+  yield SpecialPowers.pushPrefEnv({"set": [["accessibility.tabfocus", 7]]});
   yield BrowserTestUtils.withNewTab("about:blank", function*(browser) {
     // Loading about:blank will automatically focus the urlbar, which, however, can
     // race with the test code. So we only send the shortcut if the urlbar isn't focused yet.
     if (document.activeElement != gURLBar.inputField) {
       yield synthesizeKeyAndWaitForFocus(gURLBar, "l", {accelKey: true})
     }
     is(document.activeElement, gURLBar.inputField, "urlbar should be focused");
     yield synthesizeKeyAndWaitForFocus(gBrowser.getTabForBrowser(browser), "VK_TAB", {shiftKey: true})