Bug 1596897 - Updated tests for decoupled permissions panel. r=johann…

…h,remote-protocol-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D99893

accessible/tests/browser/mac/browser_app.js

@@ -145,7 +145,7 @@ add_task(async () => {
       is(rootChildCount(), 5, "Root has 5 children");
 
       // Open site identity popup
-      document.getElementById("identity-box").click();
+      document.getElementById("identity-icon-box").click();
       const identityPopup = document.getElementById("identity-popup");
       await BrowserTestUtils.waitForPopupEvent(identityPopup, "shown");
 

browser/base/content/test/fullscreen/browser_bug1557041.js

@@ -21,7 +21,9 @@ add_task(async function test_identityPopupCausesFSExit() {
     BrowserTestUtils.loadURI(browser, url);
     await loaded;
 
-    let identityBox = document.getElementById("identity-box");
+    let identityPermissionBox = document.getElementById(
+      "identity-permission-box"
+    );
 
     info("Entering DOM fullscreen");
     await changeFullscreen(browser, true);
@@ -30,16 +32,16 @@ add_task(async function test_identityPopupCausesFSExit() {
       window,
       "popupshown",
       true,
-      event => event.target == document.getElementById("identity-popup")
+      event => event.target == document.getElementById("permission-popup")
     );
     let fsExit = waitForFullScreenState(browser, false);
 
-    identityBox.click();
+    identityPermissionBox.click();
 
-    info("Waiting for fullscreen exit and identity popup to show");
+    info("Waiting for fullscreen exit and permission popup to show");
     await Promise.all([fsExit, popupShown]);
 
-    let identityPopup = document.getElementById("identity-popup");
+    let identityPopup = document.getElementById("permission-popup");
     ok(
       identityPopup.hasAttribute("panelopen"),
       "Identity popup should be open"

browser/base/content/test/general/browser_addCertException.js

@@ -20,7 +20,7 @@ add_task(async function() {
     true,
     event => event.target == gIdentityHandler._identityPopup
   );
-  gIdentityHandler._identityBox.click();
+  gIdentityHandler._identityIconBox.click();
   await promisePanelOpen;
 
   let promiseViewShown = BrowserTestUtils.waitForEvent(

browser/base/content/test/general/browser_drag.js

@@ -24,7 +24,7 @@ async function test() {
   gURLBar.setPageProxyState("valid");
   let result = await EventUtils.synthesizePlainDragAndCancel(
     {
-      srcElement: document.getElementById("identity-box"),
+      srcElement: document.getElementById("identity-icon-box"),
     },
     expected
   );

browser/base/content/test/keyboard/browser_toolbarKeyNav.js

@@ -353,18 +353,25 @@ add_task(async function testPanelCloseRestoresFocus() {
 // Test that the arrow key works in the group of the
 // 'tracking-protection-icon-container' and the 'identity-box'.
 add_task(async function testArrowKeyForTPIconContainerandIdentityBox() {
-  await BrowserTestUtils.withNewTab("https://example.com", async function() {
+  await BrowserTestUtils.withNewTab("https://example.com", async function(
+    browser
+  ) {
+    // Simulate geo sharing so the permission box shows
+    gBrowser.updateBrowserSharing(browser, { geo: true });
     await waitUntilReloadEnabled();
     startFromUrlBar();
     await expectFocusAfterKey(
       "Shift+Tab",
       "tracking-protection-icon-container"
     );
-    await expectFocusAfterKey("ArrowRight", "identity-box");
+    await expectFocusAfterKey("ArrowRight", "identity-icon-box");
+    await expectFocusAfterKey("ArrowRight", "identity-permission-box");
+    await expectFocusAfterKey("ArrowLeft", "identity-icon-box");
     await expectFocusAfterKey(
       "ArrowLeft",
       "tracking-protection-icon-container"
     );
+    gBrowser.updateBrowserSharing(browser, { geo: false });
   });
 });
 

browser/base/content/test/permissions/browser_autoplay_blocked.js

@@ -29,23 +29,23 @@ const EMPTY_PAGE =
 const AUTOPLAY_PREF = "media.autoplay.default";
 const AUTOPLAY_PERM = "autoplay-media";
 
-function openIdentityPopup() {
+function openPermissionPopup() {
   let promise = BrowserTestUtils.waitForEvent(
     gBrowser.ownerGlobal,
     "popupshown",
     true,
-    event => event.target == gIdentityHandler._identityPopup
+    event => event.target == gPermissionPanel._permissionPopup
   );
-  gIdentityHandler._identityBox.click();
+  gPermissionPanel._identityPermissionBox.click();
   return promise;
 }
 
-function closeIdentityPopup() {
+function closePermissionPopup() {
   let promise = BrowserTestUtils.waitForEvent(
-    gIdentityHandler._identityPopup,
+    gPermissionPanel._permissionPopup,
     "popuphidden"
   );
-  gIdentityHandler._identityPopup.hidePopup();
+  gPermissionPanel._permissionPopup.hidePopup();
   return promise;
 }
 
@@ -58,7 +58,7 @@ function autoplayBlockedIcon() {
 
 function permissionListBlockedIcons() {
   return document.querySelectorAll(
-    "image.identity-popup-permission-icon.blocked-permission-icon"
+    "image.permission-popup-permission-icon.blocked-permission-icon"
   );
 }
 
@@ -79,6 +79,20 @@ async function blockedIconHidden() {
   }, "Blocked icon is hidden");
 }
 
+function testPermListHasEntries(expectEntries) {
+  let permissionsList = document.getElementById(
+    "permission-popup-permission-list"
+  );
+  let listEntryCount = permissionsList.querySelectorAll(
+    ".permission-popup-permission-item"
+  ).length;
+  if (expectEntries) {
+    ok(listEntryCount, "List of permissions is not empty");
+    return;
+  }
+  ok(!listEntryCount, "List of permissions is empty");
+}
+
 add_task(async function setup() {
   registerCleanupFunction(() => {
     Services.perms.removeAll();
@@ -90,44 +104,36 @@ add_task(async function testMainViewVisible() {
   Services.prefs.setIntPref(AUTOPLAY_PREF, Ci.nsIAutoplay.ALLOWED);
 
   await BrowserTestUtils.withNewTab(AUTOPLAY_PAGE, async function() {
-    let permissionsList = document.getElementById(
-      "identity-popup-permission-list"
-    );
-    let emptyLabel = permissionsList.nextElementSibling.nextElementSibling;
-
     ok(
       BrowserTestUtils.is_hidden(autoplayBlockedIcon()),
       "Blocked icon not shown"
     );
 
-    await openIdentityPopup();
-    ok(!BrowserTestUtils.is_hidden(emptyLabel), "List of permissions is empty");
-    await closeIdentityPopup();
+    await openPermissionPopup();
+    testPermListHasEntries(false);
+    await closePermissionPopup();
   });
 
   Services.prefs.setIntPref(AUTOPLAY_PREF, Ci.nsIAutoplay.BLOCKED);
 
   await BrowserTestUtils.withNewTab(AUTOPLAY_PAGE, async function(browser) {
     let permissionsList = document.getElementById(
-      "identity-popup-permission-list"
+      "permission-popup-permission-list"
     );
-    let emptyLabel = permissionsList.nextElementSibling.nextElementSibling;
 
     await blockedIconShown();
 
-    await openIdentityPopup();
-    ok(
-      BrowserTestUtils.is_hidden(emptyLabel),
-      "List of permissions is not empty"
-    );
+    await openPermissionPopup();
+    testPermListHasEntries(true);
+
     let labelText = SitePermissions.getPermissionLabel(AUTOPLAY_PERM);
     let labels = permissionsList.querySelectorAll(
-      ".identity-popup-permission-label"
+      ".permission-popup-permission-label"
     );
     is(labels.length, 1, "One permission visible in main view");
     is(labels[0].textContent, labelText, "Correct value");
 
-    let menulist = document.getElementById("identity-popup-popup-menulist");
+    let menulist = document.getElementById("permission-popup-menulist");
     Assert.equal(menulist.label, "Block Audio");
 
     await EventUtils.synthesizeMouseAtCenter(menulist, { type: "mousedown" });
@@ -143,7 +149,7 @@ add_task(async function testMainViewVisible() {
 
     menuitem.click();
     menulist.menupopup.hidePopup();
-    await closeIdentityPopup();
+    await closePermissionPopup();
 
     let uri = Services.io.newURI(AUTOPLAY_PAGE);
     let state = PermissionTestUtils.getPermissionObject(uri, AUTOPLAY_PERM)
@@ -311,15 +317,15 @@ add_task(async function testBlockedAll() {
     BrowserTestUtils.loadURI(browser, MUTED_AUTOPLAY_PAGE);
     await blockedIconShown();
 
-    await openIdentityPopup();
+    await openPermissionPopup();
 
     Assert.equal(
       permissionListBlockedIcons().length,
       1,
       "Blocked icon is shown"
     );
 
-    let menulist = document.getElementById("identity-popup-popup-menulist");
+    let menulist = document.getElementById("permission-popup-menulist");
     await EventUtils.synthesizeMouseAtCenter(menulist, { type: "mousedown" });
     await TestUtils.waitForCondition(() => {
       return (
@@ -330,7 +336,7 @@ add_task(async function testBlockedAll() {
     let menuitem = menulist.getElementsByTagName("menuitem")[0];
     menuitem.click();
     menulist.menupopup.hidePopup();
-    await closeIdentityPopup();
+    await closePermissionPopup();
     gBrowser.reload();
     await blockedIconHidden();
   });