1 files changed, 27 insertions, 27 deletions

diff --git a/browser/components/firefoxview/tests/browser/browser_firefoxview_navigation.js b/browser/components/firefoxview/tests/browser/browser_firefoxview_navigation.js
index 80206dd945..281d969b39 100644
--- a/browser/components/firefoxview/tests/browser/browser_firefoxview_navigation.js
+++ b/browser/components/firefoxview/tests/browser/browser_firefoxview_navigation.js
@@ -3,15 +3,15 @@
 
 const URL_BASE = `${getFirefoxViewURL()}#`;
 
-function assertCorrectPage(document, name, event) {
+function assertCorrectPage(document, view, event) {
   is(
     document.location.hash,
-    `#${name}`,
-    `Navigation button for ${name} navigates to ${URL_BASE + name} on ${event}.`
+    `#${view}`,
+    `Navigation button for ${view} navigates to ${URL_BASE + view} on ${event}.`
   );
   is(
     document.querySelector("named-deck").selectedViewName,
-    name,
+    view,
     "The correct deck child is selected"
   );
 }
@@ -22,21 +22,21 @@ add_task(async function test_side_component_navigation_by_click() {
 
     const { document } = browser.contentWindow;
     let win = browser.ownerGlobal;
-    const categoryButtons = document.querySelectorAll("fxview-category-button");
+    const pageNavButtons = document.querySelectorAll("moz-page-nav-button");
 
-    for (let element of categoryButtons) {
-      const name = element.name;
+    for (let element of pageNavButtons) {
+      const view = element.view;
       let buttonClicked = BrowserTestUtils.waitForEvent(
         element.buttonEl,
         "click",
         win
       );
 
-      info(`Clicking navigation button for ${name}`);
+      info(`Clicking navigation button for ${view}`);
       EventUtils.synthesizeMouseAtCenter(element.buttonEl, {}, content);
       await buttonClicked;
 
-      assertCorrectPage(document, name, "click");
+      assertCorrectPage(document, view, "click");
     }
   });
 });
@@ -47,49 +47,49 @@ add_task(async function test_side_component_navigation_by_keyboard() {
 
     const { document } = browser.contentWindow;
     let win = browser.ownerGlobal;
-    const categoryButtons = document.querySelectorAll("fxview-category-button");
-    const firstButton = categoryButtons[0];
+    const pageNavButtons = document.querySelectorAll("moz-page-nav-button");
+    const firstButton = pageNavButtons[0].buttonEl;
 
     firstButton.focus();
     is(
-      document.activeElement,
+      document.activeElement.shadowRoot.activeElement,
       firstButton,
-      "The first category button has focus"
+      "The first page nav button has focus"
     );
 
-    for (let element of Array.from(categoryButtons).slice(1)) {
-      const name = element.name;
+    for (let element of Array.from(pageNavButtons).slice(1)) {
+      const view = element.view;
       let buttonFocused = BrowserTestUtils.waitForEvent(element, "focus", win);
 
-      info(`Focus is on ${document.activeElement.name}`);
-      info(`Arrow down on navigation to ${name}`);
+      info(`Focus is on ${document.activeElement.view}`);
+      info(`Arrow down on navigation to ${view}`);
       EventUtils.synthesizeKey("KEY_ArrowDown", {}, win);
       await buttonFocused;
 
-      assertCorrectPage(document, name, "key press");
+      assertCorrectPage(document, view, "key press");
     }
   });
 });
 
-add_task(async function test_direct_navigation_to_correct_category() {
+add_task(async function test_direct_navigation_to_correct_view() {
   await withFirefoxView({}, async browser => {
     const { document } = browser.contentWindow;
-    const categoryButtons = document.querySelectorAll("fxview-category-button");
+    const pageNavButtons = document.querySelectorAll("moz-page-nav-button");
     const namedDeck = document.querySelector("named-deck");
 
-    for (let element of categoryButtons) {
-      const name = element.name;
+    for (let element of pageNavButtons) {
+      const view = element.view;
 
-      info(`Navigating to ${URL_BASE + name}`);
-      document.location.assign(URL_BASE + name);
+      info(`Navigating to ${URL_BASE + view}`);
+      document.location.assign(URL_BASE + view);
       await BrowserTestUtils.waitForCondition(() => {
-        return namedDeck.selectedViewName === name;
+        return namedDeck.selectedViewName === view;
       }, "Wait for navigation to complete");
 
       is(
         namedDeck.selectedViewName,
-        name,
-        `The correct deck child for category ${name} is selected`
+        view,
+        `The correct deck child for view ${view} is selected`
       );
     }
   });