Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-24 02:35:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1466929 - Fix intermittent issues in browser_bookmarkProperties_remember_folders.js. r=mak

Browse Source 
Ensure we wait for the onItemMoved notification before proceeding, to avoid async issues. Also improve the wait for checks to provide better debug.

Differential Revision: https://phabricator.services.mozilla.com/D1579
This commit is contained in:
Mark Banner 2018-06-07 11:42:11 +00:00
parent f9f1477119
commit 3623389a1b
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
browser/components/places/tests/browser/browser_bookmarkProperties_remember_folders.js
View File

@ -24,23 +24,42 @@ async function hideBookmarksPanel() {
await hiddenPromise;
}
async function openPopupAndSelectFolder(guid) {
async function openPopupAndSelectFolder(guid, newBookmark = false) {
await clickBookmarkStar();
let notificationPromise;
if (!newBookmark) {
notificationPromise = PlacesTestUtils.waitForNotification("onItemMoved",
(id, oldParentId, oldIndex, newParentId, newIndex, type,
itemGuid, oldParentGuid, newParentGuid) => guid == newParentGuid);
}
// Expand the folder tree.
document.getElementById("editBMPanel_foldersExpander").click();
document.getElementById("editBMPanel_folderTree").selectItems([guid]);
await hideBookmarksPanel();
// Ensure the meta data has had chance to be written to disk.
await PlacesTestUtils.promiseAsyncUpdates();
if (!newBookmark) {
await notificationPromise;
}
}
async function assertRecentFolders(expectedGuids, msg) {
// Give the metadata chance to be written to the database before we attempt
// to open the dialog again.
let diskGuids = [];
await TestUtils.waitForCondition(async () => {
diskGuids = await PlacesUtils.metadata.get(PlacesUIUtils.LAST_USED_FOLDERS_META_KEY, []);
return diskGuids.length == expectedGuids.length;
}, `Should have written data to disk for: ${msg}`);
Assert.deepEqual(diskGuids, expectedGuids, `Should match the disk GUIDS for ${msg}`);
await clickBookmarkStar();
let actualGuids = [];
function getGuids() {
actualGuids = [];
const folderMenuPopup = document.getElementById("editBMPanel_folderMenuList").children[0];
let separatorFound = false;
@ -54,10 +73,12 @@ async function assertRecentFolders(expectedGuids, msg) {
}
}
// The dialog fills in the folder list asnychronously, so we might need to wait
// for that to complete.
await TestUtils.waitForCondition(() => {
getGuids();
return actualGuids.length == expectedGuids.length;
}, msg);
}, `Should have opened dialog with expected recent folders for: ${msg}`);
Assert.deepEqual(actualGuids, expectedGuids, msg);
@ -115,7 +136,7 @@ add_task(async function setup() {
add_task(async function test_remember_last_folder() {
await assertRecentFolders([], "Should have no recent folders to start with.");
await openPopupAndSelectFolder(folders[0].guid);
await openPopupAndSelectFolder(folders[0].guid, true);
await assertRecentFolders([folders[0].guid], "Should have one folder in the list.");
});