forked from sailfishos/gecko-dev
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge autoland to mozilla-central. a=merge on a CLOSED TREE
- Loading branch information
Showing
159 changed files
with
1,912 additions
and
1,162 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
173 changes: 173 additions & 0 deletions
173
browser/components/places/tests/browser/browser_toolbar_other_bookmarks.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,173 @@ | ||
| /* This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
| /* eslint-disable mozilla/no-arbitrary-setTimeout */ | ||
|
|
||
| "use strict"; | ||
|
|
||
| const BOOKMARKS_H2_2020_PREF = "browser.toolbars.bookmarks.2h2020"; | ||
| const bookmarksInfo = [ | ||
| { | ||
| title: "firefox", | ||
| url: "http://example.com", | ||
| }, | ||
| { | ||
| title: "rules", | ||
| url: "http://example.com/2", | ||
| }, | ||
| { | ||
| title: "yo", | ||
| url: "http://example.com/2", | ||
| }, | ||
| ]; | ||
|
|
||
| /** | ||
| * Test showing the "Other Bookmarks" folder in the bookmarks toolbar. | ||
| */ | ||
|
|
||
| // Setup. | ||
| add_task(async function setup() { | ||
| let toolbar = document.getElementById("PersonalToolbar"); | ||
| let wasCollapsed = toolbar.collapsed; | ||
|
|
||
| // Uncollapse the personal toolbar if needed. | ||
| if (wasCollapsed) { | ||
| await promiseSetToolbarVisibility(toolbar, true); | ||
| } | ||
|
|
||
| // Cleanup. | ||
| registerCleanupFunction(async () => { | ||
| // Collapse the personal toolbar if needed. | ||
| if (wasCollapsed) { | ||
| await promiseSetToolbarVisibility(toolbar, false); | ||
| } | ||
| await PlacesUtils.bookmarks.eraseEverything(); | ||
| }); | ||
| }); | ||
|
|
||
| // Test the "Other Bookmarks" folder is shown in the toolbar when | ||
| // bookmarks are stored under that folder. | ||
| add_task(async function testShowingOtherBookmarksInToolbar() { | ||
| await SpecialPowers.pushPrefEnv({ | ||
| set: [[BOOKMARKS_H2_2020_PREF, true]], | ||
| }); | ||
|
|
||
| info("Check visibility of an empty Other Bookmarks folder."); | ||
| testIsOtherBookmarksHidden(true); | ||
|
|
||
| info("Ensure folder appears in toolbar when a new bookmark is added."); | ||
| let bookmarks = await PlacesUtils.bookmarks.insertTree({ | ||
| guid: PlacesUtils.bookmarks.unfiledGuid, | ||
| children: bookmarksInfo, | ||
| }); | ||
| testIsOtherBookmarksHidden(false); | ||
|
|
||
| info("Ensure folder disappears from toolbar when no bookmarks are present."); | ||
| await PlacesUtils.bookmarks.remove(bookmarks); | ||
|
|
||
| info("Add bookmarks to the Bookmarks Toolbar folder."); | ||
| testIsOtherBookmarksHidden(true); | ||
| }); | ||
|
|
||
| // Test that folder visibility is correct when moving bookmarks to an empty | ||
| // "Other Bookmarks" folder and vice versa. | ||
| add_task(async function testOtherBookmarksVisibilityWhenMovingBookmarks() { | ||
| await SpecialPowers.pushPrefEnv({ | ||
| set: [[BOOKMARKS_H2_2020_PREF, true]], | ||
| }); | ||
|
|
||
| info("Add bookmarks to Bookmarks Toolbar."); | ||
| let bookmarks = await PlacesUtils.bookmarks.insertTree({ | ||
| guid: PlacesUtils.bookmarks.toolbarGuid, | ||
| children: bookmarksInfo, | ||
| }); | ||
| testIsOtherBookmarksHidden(true); | ||
|
|
||
| info("Move toolbar bookmarks to Other Bookmarks folder."); | ||
| await PlacesUtils.bookmarks.moveToFolder( | ||
| bookmarks.map(b => b.guid), | ||
| PlacesUtils.bookmarks.unfiledGuid, | ||
| PlacesUtils.bookmarks.DEFAULT_INDEX | ||
| ); | ||
| testIsOtherBookmarksHidden(false); | ||
|
|
||
| info("Move bookmarks from Other Bookmarks back to the toolbar."); | ||
| await PlacesUtils.bookmarks.moveToFolder( | ||
| bookmarks.map(b => b.guid), | ||
| PlacesUtils.bookmarks.toolbarGuid, | ||
| PlacesUtils.bookmarks.DEFAULT_INDEX | ||
| ); | ||
| testIsOtherBookmarksHidden(true); | ||
| }); | ||
|
|
||
| // Test OtherBookmarksPopup in toolbar. | ||
| add_task(async function testOtherBookmarksMenuPopup() { | ||
| await SpecialPowers.pushPrefEnv({ | ||
| set: [[BOOKMARKS_H2_2020_PREF, true]], | ||
| }); | ||
|
|
||
| info("Add bookmarks to Other Bookmarks folder."); | ||
| let bookmarks = await PlacesUtils.bookmarks.insertTree({ | ||
| guid: PlacesUtils.bookmarks.unfiledGuid, | ||
| children: bookmarksInfo, | ||
| }); | ||
|
|
||
| testIsOtherBookmarksHidden(false); | ||
|
|
||
| info("Check the popup menu has correct number of children."); | ||
| await openMenuPopup(); | ||
| testNumberOfMenuPopupChildren(3); | ||
| await closeMenuPopup(); | ||
|
|
||
| info("Remove a bookmark."); | ||
| await PlacesUtils.bookmarks.remove(bookmarks[0]); | ||
|
|
||
| await openMenuPopup(); | ||
| testNumberOfMenuPopupChildren(2); | ||
| await closeMenuPopup(); | ||
| }); | ||
|
|
||
| /** | ||
| * Tests whether or not the "Other Bookmarks" folder is visible. | ||
| */ | ||
| async function testIsOtherBookmarksHidden(expected) { | ||
| info("Test whether or not the 'Other Bookmarks' folder is visible."); | ||
| let otherBookmarks = document.getElementById("OtherBookmarks"); | ||
|
|
||
| await BrowserTestUtils.waitForAttribute("hidden", otherBookmarks, expected); | ||
|
|
||
| ok(true, `Other Bookmarks folder "hidden" state should be ${expected}.`); | ||
| } | ||
|
|
||
| /** | ||
| * Tests number of menu items in Other Bookmarks popup. | ||
| */ | ||
| function testNumberOfMenuPopupChildren(expected) { | ||
| let popup = document.getElementById("OtherBookmarksPopup"); | ||
| let items = popup.querySelectorAll("menuitem"); | ||
|
|
||
| is(items.length, expected, `Number of menu items should be ${expected}.`); | ||
| } | ||
|
|
||
| /** | ||
| * Helper for opening the menupopup | ||
| */ | ||
| async function openMenuPopup() { | ||
| let popup = document.getElementById("OtherBookmarksPopup"); | ||
| let target = document.getElementById("OtherBookmarks"); | ||
|
|
||
| EventUtils.synthesizeMouseAtCenter(target, {}); | ||
|
|
||
| await BrowserTestUtils.waitForPopupEvent(popup, "shown"); | ||
| } | ||
|
|
||
| /** | ||
| * Helper for closing the context menu. | ||
| */ | ||
| async function closeMenuPopup() { | ||
| let popup = document.getElementById("OtherBookmarksPopup"); | ||
|
|
||
| info("Closing menu popup."); | ||
| popup.hidePopup(); | ||
| await BrowserTestUtils.waitForPopupEvent(popup, "hidden"); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.