Backed out changeset 7ec1dad4bca4 (bug 1869836) for causing bc failures in browser_syncedtabs_firefoxview.js CLOSED TREE

Author: Cristian Tuns

browser/components/about/AboutRedirector.cpp

@@ -74,7 +74,8 @@ static const RedirEntry kRedirMap[] = {
          nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |
          nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
          nsIAboutModule::IS_SECURE_CHROME_UI},
-    {"firefoxview", "chrome://browser/content/firefoxview/firefoxview.html",
+    {"firefoxview",
+     "chrome://browser/content/firefoxview/firefoxview-next.html",
      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI |
          nsIAboutModule::HIDE_FROM_ABOUTABOUT},
     {"policies", "chrome://browser/content/policies/aboutPolicies.html",

browser/components/about/components.conf

@@ -14,6 +14,7 @@ pages = [
     'logins',
     'loginsimportreport',
     'firefoxview',
+    'firefoxview-next',
     'messagepreview',
     'newtab',
     'ion',

browser/components/firefoxview/firefoxview.css renamed to browser/components/firefoxview/firefoxview-next.css

@@ -21,7 +21,7 @@
     <link rel="localization" href="browser/migrationWizard.ftl" />
     <link
       rel="stylesheet"
-      href="chrome://browser/content/firefoxview/firefoxview.css"
+      href="chrome://browser/content/firefoxview/firefoxview-next.css"
     />
     <script
       type="module"
@@ -113,6 +113,6 @@ <h1 slot="category-nav-header" data-l10n-id="firefoxview-page-title"></h1>
         </named-deck>
       </div>
     </main>
-    <script src="chrome://browser/content/firefoxview/firefoxview.mjs"></script>
+    <script src="chrome://browser/content/firefoxview/firefoxview-next.mjs"></script>
   </body>
 </html>

browser/components/firefoxview/firefoxview.html renamed to browser/components/firefoxview/firefoxview-next.html

@@ -531,7 +531,7 @@ class HistoryInView extends ViewPage {
     return html`
       <link
         rel="stylesheet"
-        href="chrome://browser/content/firefoxview/firefoxview.css"
+        href="chrome://browser/content/firefoxview/firefoxview-next.css"
       />
       <link
         rel="stylesheet"

browser/components/firefoxview/firefoxview.mjs renamed to browser/components/firefoxview/firefoxview-next.mjs

@@ -5,16 +5,16 @@
 browser.jar:
     content/browser/firefoxview/card-container.css
     content/browser/firefoxview/card-container.mjs
-    content/browser/firefoxview/firefoxview.html
-    content/browser/firefoxview/firefoxview.mjs
+    content/browser/firefoxview/firefoxview-next.html
+    content/browser/firefoxview/firefoxview-next.mjs
     content/browser/firefoxview/history.css
     content/browser/firefoxview/history.mjs
     content/browser/firefoxview/opentabs.mjs
     content/browser/firefoxview/view-opentabs.css
     content/browser/firefoxview/syncedtabs.mjs
     content/browser/firefoxview/view-syncedtabs.css
     content/browser/firefoxview/recentbrowsing.mjs
-    content/browser/firefoxview/firefoxview.css
+    content/browser/firefoxview/firefoxview-next.css
     content/browser/firefoxview/fxview-category-button.css
     content/browser/firefoxview/fxview-category-navigation.css
     content/browser/firefoxview/fxview-category-navigation.mjs

browser/components/firefoxview/history.mjs

@@ -17,6 +17,9 @@ TESTING_JS_MODULES += [
     "tests/browser/FirefoxViewTestUtils.sys.mjs",
 ]
 
-BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.toml"]
+BROWSER_CHROME_MANIFESTS += [
+    "tests/browser/browser.toml",
+    "tests/browser/firefoxview-next/browser.toml",
+]
 
 MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"]

browser/components/firefoxview/jar.mn

@@ -205,7 +205,7 @@ class OpenTabsInView extends ViewPage {
       />
       <link
         rel="stylesheet"
-        href="chrome://browser/content/firefoxview/firefoxview.css"
+        href="chrome://browser/content/firefoxview/firefoxview-next.css"
       />
       <div class="sticky-container bottom-fade">
         <h2
@@ -498,7 +498,7 @@ class OpenTabsInViewCard extends ViewPageContent {
     return html`
       <link
         rel="stylesheet"
-        href="chrome://browser/content/firefoxview/firefoxview.css"
+        href="chrome://browser/content/firefoxview/firefoxview-next.css"
       />
       <card-container
         ?preserveCollapseState=${this.recentBrowsing}
@@ -725,7 +725,7 @@ class OpenTabsContextMenu extends MozLitElement {
     return html`
       <link
         rel="stylesheet"
-        href="chrome://browser/content/firefoxview/firefoxview.css"
+        href="chrome://browser/content/firefoxview/firefoxview-next.css"
       />
       <panel-list data-tab-type="opentabs">
         <panel-item

browser/components/firefoxview/moz.build

@@ -40,7 +40,7 @@ class RecentBrowsingInView extends ViewPage {
     return html`
       <link
         rel="stylesheet"
-        href="chrome://browser/content/firefoxview/firefoxview.css"
+        href="chrome://browser/content/firefoxview/firefoxview-next.css"
       />
       <div class="sticky-container bottom-fade">
         <h2

browser/components/firefoxview/opentabs.mjs

@@ -329,7 +329,7 @@ class RecentlyClosedTabsInView extends ViewPage {
     return html`
       <link
         rel="stylesheet"
-        href="chrome://browser/content/firefoxview/firefoxview.css"
+        href="chrome://browser/content/firefoxview/firefoxview-next.css"
       />
       ${when(
         !this.recentBrowsing,

browser/components/firefoxview/recentbrowsing.mjs

@@ -549,7 +549,7 @@ class SyncedTabsInView extends ViewPage {
     />`);
     renderArray.push(html` <link
       rel="stylesheet"
-      href="chrome://browser/content/firefoxview/firefoxview.css"
+      href="chrome://browser/content/firefoxview/firefoxview-next.css"
     />`);
 
     if (!this.recentBrowsing) {

browser/components/firefoxview/recentlyclosed.mjs

@@ -37,34 +37,3 @@ skip-if = ["true"] # Bug 1851453
 ["browser_tab_close_last_tab.js"]
 
 ["browser_tab_on_close_warning.js"]
-
-["browser_firefoxview_paused.js"]
-
-["browser_firefoxview_general_telemetry.js"]
-fail-if = ["a11y_checks"] # Bug 1854625 clicked .fxview-tab-row-secondary-button may not be focusable
-
-["browser_firefoxview_navigation.js"]
-
-["browser_firefoxview_virtual_list.js"]
-
-["browser_history_firefoxview.js"]
-
-["browser_opentabs_firefoxview.js"]
-fail-if = ["a11y_checks"] # Bugs 1854625 and 1872285 clicked .fxview-tab-row-secondary-button may not be focusable
-
-["browser_opentabs_cards.js"]
-fail-if = ["a11y_checks"] # Bug 1858041 clicked .fxview-tab-row-main and div may not be focusable
-
-["browser_opentabs_recency.js"]
-skip-if = [
-  "os == 'win'",
-  "os == 'mac' && verify"
-] # macos times out, see bug 1857293, skipped for windows, see bug 1858460
-
-
-["browser_recentlyclosed_firefoxview.js"]
-fail-if = ["a11y_checks"] # Bug 1854625 clicked button.fxview-tab-row-secondary-button and a.fxview-tab-row-main may not be focusable
-
-["browser_syncedtabs_errors_firefoxview.js"]
-
-["browser_syncedtabs_firefoxview.js"]

browser/components/firefoxview/syncedtabs.mjs

@@ -13,75 +13,3 @@ add_task(async function about_firefoxview_smoke_test() {
     ok(document.querySelector("named-deck"), "named-deck element exists");
   });
 });
-
-add_task(async function test_aria_roles() {
-  await withFirefoxView({}, async browser => {
-    const { document } = browser.contentWindow;
-    is(document.location.href, "about:firefoxview");
-
-    is(
-      document.querySelector("main").getAttribute("role"),
-      "application",
-      "The main element has role='application'"
-    );
-    // Purge session history to ensure recently closed empty state is shown
-    Services.obs.notifyObservers(null, "browser:purge-session-history");
-    let recentlyClosedComponent = document.querySelector(
-      "view-recentlyclosed[slot=recentlyclosed]"
-    );
-    await TestUtils.waitForCondition(
-      () => recentlyClosedComponent.fullyUpdated
-    );
-    let recentlyClosedEmptyState = recentlyClosedComponent.emptyState;
-    let descriptionEls = recentlyClosedEmptyState.descriptionEls;
-    is(
-      descriptionEls[1].querySelector("a").getAttribute("aria-details"),
-      "card-container",
-      "The link within the recently closed empty state has the expected 'aria-details' attribute."
-    );
-
-    let syncedTabsComponent = document.querySelector(
-      "view-syncedtabs[slot=syncedtabs]"
-    );
-    let syncedTabsEmptyState = syncedTabsComponent.emptyState;
-    is(
-      syncedTabsEmptyState.querySelector("button").getAttribute("aria-details"),
-      "empty-container",
-      "The button within the synced tabs empty state has the expected 'aria-details' attribute."
-    );
-
-    // Test keyboard navigation from card-container summary
-    // elements to links/buttons in empty states
-    const tab = async shiftKey => {
-      info(`Tab${shiftKey ? " + Shift" : ""}`);
-      EventUtils.synthesizeKey("KEY_Tab", { shiftKey });
-    };
-    recentlyClosedComponent.cardEl.summaryEl.focus();
-    ok(
-      recentlyClosedComponent.cardEl.summaryEl.matches(":focus"),
-      "Focus should be on the summary element within the recently closed card-container"
-    );
-    // Purge session history to ensure recently closed empty state is shown
-    Services.obs.notifyObservers(null, "browser:purge-session-history");
-    await TestUtils.waitForCondition(
-      () => recentlyClosedComponent.fullyUpdated
-    );
-    await tab();
-    ok(
-      descriptionEls[1].querySelector("a").matches(":focus"),
-      "Focus should be on the link within the recently closed empty state"
-    );
-    await tab();
-    const shadowRoot =
-      SpecialPowers.wrap(syncedTabsComponent).openOrClosedShadowRoot;
-    ok(
-      shadowRoot.querySelector("card-container").summaryEl.matches(":focus"),
-      "Focus should be on summary element of the synced tabs card-container"
-    );
-    await tab();
-    ok(
-      syncedTabsEmptyState.querySelector("button").matches(":focus"),
-      "Focus should be on button element of the synced tabs empty state"
-    );
-  });
-});

browser/components/firefoxview/tests/browser/browser.toml

@@ -0,0 +1,35 @@
+[DEFAULT]
+support-files = [ "../head.js"]
+
+["browser_firefoxview_next.js"]
+
+["browser_firefoxview_paused.js"]
+
+["browser_firefoxview_next_general_telemetry.js"]
+fail-if = ["a11y_checks"] # Bug 1854625 clicked .fxview-tab-row-secondary-button may not be focusable
+
+["browser_firefoxview_next_navigation.js"]
+
+["browser_firefoxview_virtual_list.js"]
+
+["browser_history_firefoxview_next.js"]
+
+["browser_opentabs_firefoxview_next.js"]
+fail-if = ["a11y_checks"] # Bugs 1854625 and 1872285 clicked .fxview-tab-row-secondary-button may not be focusable
+
+["browser_opentabs_cards.js"]
+fail-if = ["a11y_checks"] # Bug 1858041 clicked .fxview-tab-row-main and div may not be focusable
+
+["browser_opentabs_recency_next.js"]
+skip-if = [
+  "os == 'win'",
+  "os == 'mac' && verify"
+] # macos times out, see bug 1857293, skipped for windows, see bug 1858460
+
+
+["browser_recentlyclosed_firefoxview_next.js"]
+fail-if = ["a11y_checks"] # Bug 1854625 clicked button.fxview-tab-row-secondary-button and a.fxview-tab-row-main may not be focusable
+
+["browser_syncedtabs_errors_firefoxview_next.js"]
+
+["browser_syncedtabs_firefoxview_next.js"]

browser/components/firefoxview/tests/browser/browser_firefoxview.js

@@ -0,0 +1,76 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/* import-globals-from ../head.js */
+
+add_task(async function test_aria_roles() {
+  await withFirefoxView({}, async browser => {
+    const { document } = browser.contentWindow;
+    is(document.location.href, "about:firefoxview");
+
+    is(
+      document.querySelector("main").getAttribute("role"),
+      "application",
+      "The main element has role='application'"
+    );
+    // Purge session history to ensure recently closed empty state is shown
+    Services.obs.notifyObservers(null, "browser:purge-session-history");
+    let recentlyClosedComponent = document.querySelector(
+      "view-recentlyclosed[slot=recentlyclosed]"
+    );
+    await TestUtils.waitForCondition(
+      () => recentlyClosedComponent.fullyUpdated
+    );
+    let recentlyClosedEmptyState = recentlyClosedComponent.emptyState;
+    let descriptionEls = recentlyClosedEmptyState.descriptionEls;
+    is(
+      descriptionEls[1].querySelector("a").getAttribute("aria-details"),
+      "card-container",
+      "The link within the recently closed empty state has the expected 'aria-details' attribute."
+    );
+
+    let syncedTabsComponent = document.querySelector(
+      "view-syncedtabs[slot=syncedtabs]"
+    );
+    let syncedTabsEmptyState = syncedTabsComponent.emptyState;
+    is(
+      syncedTabsEmptyState.querySelector("button").getAttribute("aria-details"),
+      "empty-container",
+      "The button within the synced tabs empty state has the expected 'aria-details' attribute."
+    );
+
+    // Test keyboard navigation from card-container summary
+    // elements to links/buttons in empty states
+    const tab = async shiftKey => {
+      info(`Tab${shiftKey ? " + Shift" : ""}`);
+      EventUtils.synthesizeKey("KEY_Tab", { shiftKey });
+    };
+    recentlyClosedComponent.cardEl.summaryEl.focus();
+    ok(
+      recentlyClosedComponent.cardEl.summaryEl.matches(":focus"),
+      "Focus should be on the summary element within the recently closed card-container"
+    );
+    // Purge session history to ensure recently closed empty state is shown
+    Services.obs.notifyObservers(null, "browser:purge-session-history");
+    await TestUtils.waitForCondition(
+      () => recentlyClosedComponent.fullyUpdated
+    );
+    await tab();
+    ok(
+      descriptionEls[1].querySelector("a").matches(":focus"),
+      "Focus should be on the link within the recently closed empty state"
+    );
+    await tab();
+    const shadowRoot =
+      SpecialPowers.wrap(syncedTabsComponent).openOrClosedShadowRoot;
+    ok(
+      shadowRoot.querySelector("card-container").summaryEl.matches(":focus"),
+      "Focus should be on summary element of the synced tabs card-container"
+    );
+    await tab();
+    ok(
+      syncedTabsEmptyState.querySelector("button").matches(":focus"),
+      "Focus should be on button element of the synced tabs empty state"
+    );
+  });
+});

browser/components/firefoxview/tests/browser/firefoxview-next/browser.toml

@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
+/* import-globals-from ../head.js */
+
 const CARD_COLLAPSED_EVENT = [
   ["firefoxview_next", "card_collapsed", "card_container", undefined],
 ];
@@ -299,7 +301,6 @@ add_task(async function test_context_menu_private_window_telemetry() {
 });
 
 add_task(async function test_context_menu_delete_from_history_telemetry() {
-  await PlacesUtils.history.clear();
   await PlacesUtils.history.insert({
     url: URLs[0],
     title: "Example Domain 1",

browser/components/firefoxview/tests/browser/firefoxview-next/browser_firefoxview_next.js

@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
+/* import-globals-from ../head.js */
+
 const URL_BASE = `${getFirefoxViewURL()}#`;
 
 function assertCorrectPage(document, name, event) {

browser/components/firefoxview/tests/browser/browser_firefoxview_general_telemetry.js renamed to browser/components/firefoxview/tests/browser/firefoxview-next/browser_firefoxview_next_general_telemetry.js

@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
+/* import-globals-from ../head.js */
+
 const tabURL1 = "data:,Tab1";
 const tabURL2 = "data:,Tab2";
 const tabURL3 = "data:,Tab3";

browser/components/firefoxview/tests/browser/browser_firefoxview_navigation.js renamed to browser/components/firefoxview/tests/browser/firefoxview-next/browser_firefoxview_next_navigation.js

@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
+/* import-globals-from ../head.js */
+
 const VIRTUAL_LIST_ENABLED_PREF = "browser.firefox-view.virtual-list.enabled";
 
 add_setup(async () => {