diff options
Diffstat (limited to 'browser/base/content/test/sidebar')
6 files changed, 49 insertions, 46 deletions
diff --git a/browser/base/content/test/sidebar/browser_sidebar_adopt.js b/browser/base/content/test/sidebar/browser_sidebar_adopt.js index 344a71cb9b..988ac1487f 100644 --- a/browser/base/content/test/sidebar/browser_sidebar_adopt.js +++ b/browser/base/content/test/sidebar/browser_sidebar_adopt.js @@ -5,7 +5,7 @@ * during the initial browser startup - but it would be hard to do with a mochitest. */ registerCleanupFunction(() => { - SidebarUI.hide(); + SidebarController.hide(); }); function failIfSidebarFocusedFires() { @@ -26,7 +26,7 @@ add_task(async function testAdoptedTwoWindows() { info("Ensure that sidebar state is adopted only from the opener"); let win1 = await BrowserTestUtils.openNewBrowserWindow(); - await win1.SidebarUI.show("viewBookmarksSidebar"); + await win1.SidebarController.show("viewBookmarksSidebar"); await BrowserTestUtils.closeWindow(win1); let win2 = await BrowserTestUtils.openNewBrowserWindow(); @@ -34,7 +34,7 @@ add_task(async function testAdoptedTwoWindows() { !win2.document.getElementById("sidebar-button").hasAttribute("checked"), "Sidebar button isn't checked" ); - ok(!win2.SidebarUI.isOpen, "Sidebar is closed"); + ok(!win2.SidebarController.isOpen, "Sidebar is closed"); await BrowserTestUtils.closeWindow(win2); }); @@ -46,7 +46,7 @@ add_task(async function testEventsReceivedInMainWindow() { let initialShown = BrowserTestUtils.waitForEvent(window, "SidebarShown"); let initialFocus = BrowserTestUtils.waitForEvent(window, "SidebarFocused"); - await SidebarUI.show("viewBookmarksSidebar"); + await SidebarController.show("viewBookmarksSidebar"); await initialShown; await initialFocus; diff --git a/browser/base/content/test/sidebar/browser_sidebar_app_locale_changed.js b/browser/base/content/test/sidebar/browser_sidebar_app_locale_changed.js index 5b07da9839..1e52895a7d 100644 --- a/browser/base/content/test/sidebar/browser_sidebar_app_locale_changed.js +++ b/browser/base/content/test/sidebar/browser_sidebar_app_locale_changed.js @@ -8,7 +8,7 @@ add_task(function cleanup() { registerCleanupFunction(() => { - SidebarUI.hide(); + SidebarController.hide(); }); }); @@ -17,7 +17,7 @@ add_task(function cleanup() { */ async function testLiveReloading(sidebarName) { info("Showing the sidebar " + sidebarName); - await SidebarUI.show(sidebarName); + await SidebarController.show(sidebarName); function getTreeChildren() { const sidebarDoc = @@ -44,7 +44,7 @@ async function testLiveReloading(sidebarName) { ); info("Hiding the sidebar"); - SidebarUI.hide(); + SidebarController.hide(); } add_task(async function test_bookmarks_sidebar() { diff --git a/browser/base/content/test/sidebar/browser_sidebar_keys.js b/browser/base/content/test/sidebar/browser_sidebar_keys.js index f12d1cf5f7..61e4ce9737 100644 --- a/browser/base/content/test/sidebar/browser_sidebar_keys.js +++ b/browser/base/content/test/sidebar/browser_sidebar_keys.js @@ -11,11 +11,11 @@ async function testSidebarKeyToggle(key, options, expectedSidebarId) { expectedSidebarId ); EventUtils.synthesizeKey(key, options); - Assert.ok(!SidebarUI.isOpen); + Assert.ok(!SidebarController.isOpen); } add_task(async function test_sidebar_keys() { - registerCleanupFunction(() => SidebarUI.hide()); + registerCleanupFunction(() => SidebarController.hide()); await testSidebarKeyToggle("b", { accelKey: true }, "viewBookmarksSidebar"); @@ -30,7 +30,7 @@ add_task(async function test_sidebar_in_customize_mode() { let { CustomizableUI } = ChromeUtils.importESModule( "resource:///modules/CustomizableUI.sys.mjs" ); - registerCleanupFunction(() => SidebarUI.hide()); + registerCleanupFunction(() => SidebarController.hide()); let placement = CustomizableUI.getPlacementOfWidget("sidebar-button"); if (!(placement?.area == CustomizableUI.AREA_NAVBAR)) { @@ -55,7 +55,7 @@ add_task(async function test_sidebar_in_customize_mode() { ).a; let promiseShown = BrowserTestUtils.waitForEvent(window, "SidebarShown"); - SidebarUI.show("viewBookmarksSidebar"); + SidebarController.show("viewBookmarksSidebar"); await promiseShown; Assert.greater( @@ -80,8 +80,8 @@ add_task(async function test_sidebar_in_customize_mode() { ); // Attempt toggle - should fail in customize mode. - await SidebarUI.toggle(); - ok(SidebarUI.isOpen, "Sidebar is still open"); + await SidebarController.toggle(); + ok(SidebarController.isOpen, "Sidebar is still open"); // Exit customize mode. This should re-enable the toggle and make the sidebar // toggle widget appear checked again, since toggle() didn't hide the sidebar. @@ -98,8 +98,8 @@ add_task(async function test_sidebar_in_customize_mode() { "Sidebar widget background should appear checked again" ); - await SidebarUI.toggle(); - ok(!SidebarUI.isOpen, "Sidebar is closed"); + await SidebarController.toggle(); + ok(!SidebarController.isOpen, "Sidebar is closed"); Assert.equal( getBGAlpha(), 0, diff --git a/browser/base/content/test/sidebar/browser_sidebar_move.js b/browser/base/content/test/sidebar/browser_sidebar_move.js index d434b3bbd8..05ea9e3322 100644 --- a/browser/base/content/test/sidebar/browser_sidebar_move.js +++ b/browser/base/content/test/sidebar/browser_sidebar_move.js @@ -1,17 +1,17 @@ registerCleanupFunction(() => { Services.prefs.clearUserPref("sidebar.position_start"); - SidebarUI.hide(); + SidebarController.hide(); }); const EXPECTED_START_ORDINALS = [ - ["sidebar-launcher", 1], + ["sidebar-main", 1], ["sidebar-box", 2], ["sidebar-splitter", 3], ["appcontent", 4], ]; const EXPECTED_END_ORDINALS = [ - ["sidebar-launcher", 5], + ["sidebar-main", 5], ["sidebar-box", 4], ["sidebar-splitter", 3], ["appcontent", 2], @@ -25,8 +25,8 @@ function getBrowserChildrenWithOrdinals() { } add_task(async function () { - await SidebarUI.show("viewBookmarksSidebar"); - SidebarUI.showSwitcherPanel(); + await SidebarController.show("viewBookmarksSidebar"); + SidebarController.showSwitcherPanel(); let reversePositionButton = document.getElementById( "sidebar-reverse-position" @@ -43,8 +43,8 @@ add_task(async function () { ok(!box.hasAttribute("positionend"), "Positioned start"); // Moved to right - SidebarUI.reversePosition(); - SidebarUI.showSwitcherPanel(); + SidebarController.reversePosition(); + SidebarController.showSwitcherPanel(); Assert.deepEqual( getBrowserChildrenWithOrdinals(), EXPECTED_END_ORDINALS, @@ -58,8 +58,8 @@ add_task(async function () { ok(box.hasAttribute("positionend"), "Positioned end"); // Moved to back to left - SidebarUI.reversePosition(); - SidebarUI.showSwitcherPanel(); + SidebarController.reversePosition(); + SidebarController.showSwitcherPanel(); Assert.deepEqual( getBrowserChildrenWithOrdinals(), EXPECTED_START_ORDINALS, diff --git a/browser/base/content/test/sidebar/browser_sidebar_persist.js b/browser/base/content/test/sidebar/browser_sidebar_persist.js index fe67bed9e0..4977c7ef0f 100644 --- a/browser/base/content/test/sidebar/browser_sidebar_persist.js +++ b/browser/base/content/test/sidebar/browser_sidebar_persist.js @@ -18,7 +18,7 @@ add_task(async function persist_sidebar_width() { { info("Showing new window and setting sidebar box"); const win = await BrowserTestUtils.openNewBrowserWindow(); - await win.SidebarUI.show("viewBookmarksSidebar"); + await win.SidebarController.show("viewBookmarksSidebar"); win.document.getElementById("sidebar-box").style.width = "100px"; await BrowserTestUtils.closeWindow(win); } @@ -26,7 +26,7 @@ add_task(async function persist_sidebar_width() { { info("Showing new window and seeing persisted width"); const win = await BrowserTestUtils.openNewBrowserWindow(); - await win.SidebarUI.show("viewBookmarksSidebar"); + await win.SidebarController.show("viewBookmarksSidebar"); is( win.document.getElementById("sidebar-box").style.width, "100px", diff --git a/browser/base/content/test/sidebar/browser_sidebar_switcher.js b/browser/base/content/test/sidebar/browser_sidebar_switcher.js index 032c23b029..0fc9e18e01 100644 --- a/browser/base/content/test/sidebar/browser_sidebar_switcher.js +++ b/browser/base/content/test/sidebar/browser_sidebar_switcher.js @@ -1,5 +1,5 @@ registerCleanupFunction(() => { - SidebarUI.hide(); + SidebarController.hide(); }); /** @@ -9,14 +9,14 @@ registerCleanupFunction(() => { */ function showSwitcherPanelPromise() { return new Promise(resolve => { - SidebarUI._switcherPanel.addEventListener( + SidebarController._switcherPanel.addEventListener( "popupshown", () => { resolve(); }, { once: true } ); - SidebarUI.showSwitcherPanel(); + SidebarController.showSwitcherPanel(); }); } @@ -25,7 +25,10 @@ function showSwitcherPanelPromise() { * @returns Promise which resolves when the popup menu is opened */ async function waitForSwitcherPopupShown() { - return BrowserTestUtils.waitForEvent(SidebarUI._switcherPanel, "popupshown"); + return BrowserTestUtils.waitForEvent( + SidebarController._switcherPanel, + "popupshown" + ); } /** @@ -63,7 +66,7 @@ async function testSidebarMenuKeyToggle(key, sidebarTitle) { info(`Testing "${key}" key handling of sidebar menu popup items to access ${sidebarTitle} sidebar`); - Assert.ok(SidebarUI.isOpen, "Sidebar is open"); + Assert.ok(SidebarController.isOpen, "Sidebar is open"); let sidebarSwitcher = document.querySelector("#sidebar-switcher-target"); let sidebar = document.getElementById("sidebar"); @@ -89,7 +92,7 @@ async function testSidebarMenuKeyToggle(key, sidebarTitle) { "The sidebar switcher target button is focused" ); Assert.equal( - SidebarUI._switcherPanel.state, + SidebarController._switcherPanel.state, "closed", "Sidebar menu popup is closed" ); @@ -102,7 +105,7 @@ async function testSidebarMenuKeyToggle(key, sidebarTitle) { await promisePopupShown; Assert.equal( - SidebarUI._switcherPanel.state, + SidebarController._switcherPanel.state, "open", "Sidebar menu popup is open" ); @@ -111,7 +114,7 @@ async function testSidebarMenuKeyToggle(key, sidebarTitle) { let arrowDown = async (menuitemId, msg) => { let menuItemActive = BrowserTestUtils.waitForEvent( - SidebarUI._switcherPanel, + SidebarController._switcherPanel, "DOMMenuItemActive" ); EventUtils.synthesizeKey("KEY_ArrowDown", {}); @@ -149,18 +152,18 @@ async function testSidebarMenuKeyToggle(key, sidebarTitle) { info("Testing keyboard navigation when a sidebar menu popup is closed"); Assert.equal( - SidebarUI._switcherPanel.state, + SidebarController._switcherPanel.state, "closed", "Sidebar menu popup is closed" ); // Test the sidebar panel is updated Assert.equal( - SidebarUI._box.getAttribute("sidebarcommand"), + SidebarController._box.getAttribute("sidebarcommand"), `view${sidebarTitle}Sidebar` /* e.g. "viewHistorySidebar" */, `${sidebarTitle} sidebar loaded` ); Assert.equal( - SidebarUI.currentID, + SidebarController.currentID, `view${sidebarTitle}Sidebar` /* e.g. "viewHistorySidebar" */, `${sidebarTitle}'s current ID is updated to a target view` ); @@ -173,7 +176,7 @@ add_task(async function markup() { false, "Unexpected sidebar found - a previous test failed to cleanup correctly" ); - SidebarUI.hide(); + SidebarController.hide(); } let sidebarPopup = document.querySelector("#sidebarMenu-popup"); @@ -205,7 +208,7 @@ add_task(async function markup() { info("Test dynamic changes in the markup of the sidebar switcher control"); - await SidebarUI.show("viewBookmarksSidebar"); + await SidebarController.show("viewBookmarksSidebar"); await showSwitcherPanelPromise(); Assert.equal( @@ -229,25 +232,25 @@ add_task(async function markup() { "Sidebar switcher button is collapsed when a sidebar menu is dismissed" ); - SidebarUI.hide(); + SidebarController.hide(); }); add_task(async function keynav() { // If a sidebar is already open, close it. - if (SidebarUI.isOpen) { + if (SidebarController.isOpen) { Assert.ok( false, "Unexpected sidebar found - a previous test failed to cleanup correctly" ); - SidebarUI.hide(); + SidebarController.hide(); } - await SidebarUI.show("viewBookmarksSidebar"); + await SidebarController.show("viewBookmarksSidebar"); await testSidebarMenuKeyToggle("KEY_Enter", "History"); await testSidebarMenuKeyToggle(" ", "Tabs"); - SidebarUI.hide(); + SidebarController.hide(); }); add_task(async function mouse() { @@ -257,11 +260,11 @@ add_task(async function mouse() { false, "Unexpected sidebar found - a previous test failed to cleanup correctly" ); - SidebarUI.hide(); + SidebarController.hide(); } let sidebar = document.querySelector("#sidebar-box"); - await SidebarUI.show("viewBookmarksSidebar"); + await SidebarController.show("viewBookmarksSidebar"); await showSwitcherPanelPromise(); await pickSwitcherMenuitem("#sidebar-switcher-history"); |