From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- devtools/client/storage/test/browser_storage_cache_navigation.js | 5 ++++- devtools/client/storage/test/browser_storage_cookies_navigation.js | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'devtools/client/storage') diff --git a/devtools/client/storage/test/browser_storage_cache_navigation.js b/devtools/client/storage/test/browser_storage_cache_navigation.js index 5421b85028..0a7ed68484 100644 --- a/devtools/client/storage/test/browser_storage_cache_navigation.js +++ b/devtools/client/storage/test/browser_storage_cache_navigation.js @@ -51,7 +51,10 @@ add_task(async function () { // Check second domain await navigateTo(URL2); - // Select the Cache view in order to force updating it + info("Waiting until Cache > example.net is available in the UI"); + await waitUntil(() => gUI.tree.exists(["Cache", "https://example.net"])); + + info("Select the Cache view in order to force updating it"); await selectTreeItem(["Cache", "https://example.net"]); // wait for storage tree refresh, and check host diff --git a/devtools/client/storage/test/browser_storage_cookies_navigation.js b/devtools/client/storage/test/browser_storage_cookies_navigation.js index 3dc1406451..cd4a562a33 100644 --- a/devtools/client/storage/test/browser_storage_cookies_navigation.js +++ b/devtools/client/storage/test/browser_storage_cookies_navigation.js @@ -115,6 +115,12 @@ add_task(async function () { "host of iframe in previous document (example.org) is not in the tree anymore" ); + // indexedDB is slightly more asynchronously fetched than the others + // and is emitted as a Resource to the frontend late. navigateTo isn't waiting for + // the full initialization of the storage panel on reload. + // To avoid exception when navigating back wait for indexed DB to be updated. + await waitUntil(() => isInTree(doc, ["indexedDB", "https://example.com"])); + info("Navigate backward to test bfcache navigation"); gBrowser.goBack(); await waitUntil( -- cgit v1.2.3