Bug 1703387 - Fix failures in browser/modules/test/browser/browser_PageActions.js with proton urlbar. r=mak

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

browser/modules/test/browser/browser_PageActions.js

@@ -4,6 +4,10 @@
 // add and remove page actions and toggle them in the urlbar.  This does not
 // test the built-in page actions; browser_page_action_menu.js does that.
 
+const PROTON_PREF = "browser.proton.urlbar.enabled";
+
+let gProton;
+
 // Initialization.  Must run first.
 add_task(async function init() {
   // The page action urlbar button, and therefore the panel, is only shown when
@@ -22,6 +26,16 @@ add_task(async function init() {
   // Ensure screenshots is really disabled (bug 1498738)
   const addon = await AddonManager.getAddonByID("screenshots@mozilla.org");
   await addon.disable({ allowSystemAddons: true });
+
+  gProton = Services.prefs.getBoolPref(PROTON_PREF, false);
+  if (gProton) {
+    // Make the main button visible. It's not unless the window is narrow. This
+    // test isn't concerned with that behavior. We have other tests for that.
+    BrowserPageActions.mainButtonNode.style.visibility = "visible";
+    registerCleanupFunction(() => {
+      BrowserPageActions.mainButtonNode.style.removeProperty("visibility");
+    });
+  }
 });
 
 // Tests a simple non-built-in action without an iframe or subview.  Also
@@ -83,7 +97,7 @@ add_task(async function simple() {
 
   Assert.equal(action.getIconURL(), iconURL, "iconURL");
   Assert.equal(action.id, id, "id");
-  Assert.equal(action.pinnedToUrlbar, false, "pinnedToUrlbar");
+  Assert.equal(action.pinnedToUrlbar, gProton, "pinnedToUrlbar");
   Assert.equal(action.getDisabled(), false, "disabled");
   Assert.equal(action.getDisabled(window), false, "disabled in window");
   Assert.equal(action.getTitle(), title, "title");
@@ -109,8 +123,8 @@ add_task(async function simple() {
   );
   Assert.equal(
     onPlacedInUrlbarCallCount,
-    0,
-    "onPlacedInUrlbarCallCount should remain 0"
+    gProton ? 1 : 0,
+    "onPlacedInUrlbarCallCount after adding the action"
   );
   Assert.equal(
     onShowingInPanelCallCount,
@@ -180,11 +194,9 @@ add_task(async function simple() {
     "Actions in panel after adding the action"
   );
 
-  // The actions in the urlbar should be the same since the test action isn't
-  // shown there.
   Assert.deepEqual(
     PageActions.actionsInUrlbar(window),
-    initialActionsInUrlbar,
+    (gProton ? [action] : []).concat(initialActionsInUrlbar),
     "Actions in urlbar after adding the action"
   );
 
@@ -228,9 +240,8 @@ add_task(async function simple() {
     "sepNode.id"
   );
 
-  // The action's urlbar button should not have been created.
   let urlbarButtonNode = document.getElementById(urlbarButtonID);
-  Assert.equal(urlbarButtonNode, null, "urlbarButtonNode");
+  Assert.equal(!!urlbarButtonNode, gProton, "urlbarButtonNode");
 
   // Open the panel, click the action's button.
   await promiseOpenPageActionPanel();
@@ -777,38 +788,40 @@ add_task(async function insertBeforeActionID() {
     "PageActions._nonBuiltInActions.length should remain the same"
   );
 
-  let actionIndex = newActions.findIndex(a => a.id == id);
-  Assert.equal(
-    initialBookmarkSeparatorIndex,
-    actionIndex,
-    "initialBookmarkSeparatorIndex"
-  );
-  let newBookmarkSeparatorIndex = newActions.findIndex(a => {
-    return a.id == PageActions.ACTION_ID_BOOKMARK_SEPARATOR;
-  });
-  Assert.equal(
-    newBookmarkSeparatorIndex,
-    initialBookmarkSeparatorIndex + 1,
-    "newBookmarkSeparatorIndex"
-  );
-
   // The action's panel button should have been created.
   let panelButtonNode = document.getElementById(panelButtonID);
   Assert.notEqual(panelButtonNode, null, "panelButtonNode");
 
-  // The button's next sibling should be the bookmark separator.
-  Assert.notEqual(
-    panelButtonNode.nextElementSibling,
-    null,
-    "panelButtonNode.nextElementSibling"
-  );
-  Assert.equal(
-    panelButtonNode.nextElementSibling.id,
-    BrowserPageActions.panelButtonNodeIDForActionID(
-      PageActions.ACTION_ID_BOOKMARK_SEPARATOR
-    ),
-    "panelButtonNode.nextElementSibling.id"
-  );
+  if (!gProton) {
+    let actionIndex = newActions.findIndex(a => a.id == id);
+    Assert.equal(
+      initialBookmarkSeparatorIndex,
+      actionIndex,
+      "initialBookmarkSeparatorIndex"
+    );
+    let newBookmarkSeparatorIndex = newActions.findIndex(a => {
+      return a.id == PageActions.ACTION_ID_BOOKMARK_SEPARATOR;
+    });
+    Assert.equal(
+      newBookmarkSeparatorIndex,
+      initialBookmarkSeparatorIndex + 1,
+      "newBookmarkSeparatorIndex"
+    );
+
+    // The button's next sibling should be the bookmark separator.
+    Assert.notEqual(
+      panelButtonNode.nextElementSibling,
+      null,
+      "panelButtonNode.nextElementSibling"
+    );
+    Assert.equal(
+      panelButtonNode.nextElementSibling.id,
+      BrowserPageActions.panelButtonNodeIDForActionID(
+        PageActions.ACTION_ID_BOOKMARK_SEPARATOR
+      ),
+      "panelButtonNode.nextElementSibling.id"
+    );
+  }
 
   // The separator between the built-in and non-built-in actions should not have
   // been created.
@@ -1224,8 +1237,8 @@ add_task(async function transient() {
   Assert.equal(onPlacedInPanelCount, 0, "onPlacedInPanelCount should remain 0");
   Assert.equal(
     onBeforePlacedInWindowCount,
-    0,
-    "onBeforePlacedInWindowCount should remain 0"
+    gProton ? 1 : 0,
+    "onBeforePlacedInWindowCount after adding transient action"
   );
 
   Assert.deepEqual(