From e735cf138305349e7fc58d84a68a863cffb3aa49 Mon Sep 17 00:00:00 2001 From: Julian Descottes Date: Thu, 23 Nov 2017 16:31:48 +0100 Subject: [PATCH] Bug 1420179 - support tab argument in devtools shared-head refreshTab;r=nchevobbe The tab argument was unused in the method. All the call sites have been updated to stop providing this argument. The method now supports an optional tab argument. It defaults to the selected tab if no argument is provided. MozReview-Commit-ID: 621dgljHdtD --HG-- extra : rebase_source : 676c998cb4b2f126d9ee075760e2d7d30078344b --- .../framework/test/browser_source_map-reload.js | 2 +- devtools/client/framework/test/shared-head.js | 12 ++++++------ .../test/browser_grids_restored-after-reload.js | 2 +- .../browser_rules_flexbox-highlighter-on-reload.js | 2 +- ...ules_flexbox-highlighter-restored-after-reload.js | 2 +- .../test/browser_rules_grid-highlighter-on-reload.js | 2 +- ...r_rules_grid-highlighter-restored-after-reload.js | 2 +- .../browser/browser_memory_refresh_does_not_leak.js | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/devtools/client/framework/test/browser_source_map-reload.js b/devtools/client/framework/test/browser_source_map-reload.js index 4d109057f16d..3819080cbd58 100644 --- a/devtools/client/framework/test/browser_source_map-reload.js +++ b/devtools/client/framework/test/browser_source_map-reload.js @@ -36,7 +36,7 @@ add_task(function* () { // Reload the page. The sjs ensures that a different source file // will be loaded. sourceSeen = waitForSourceLoad(toolbox, JS_URL); - yield refreshTab(tab); + yield refreshTab(); yield sourceSeen; info(`checking post-reload original location for ${JS_URL}:${GENERATED_LINE}`); diff --git a/devtools/client/framework/test/shared-head.js b/devtools/client/framework/test/shared-head.js index 8933468f9e97..3da248d0a51f 100644 --- a/devtools/client/framework/test/shared-head.js +++ b/devtools/client/framework/test/shared-head.js @@ -172,17 +172,17 @@ var removeTab = Task.async(function* (tab) { }); /** - * Refresh the given tab. - * @param {Object} tab The tab to be refreshed. + * Refresh the provided tab. + * @param {Object} tab The tab to be refreshed. Defaults to the currently selected tab. * @return Promise resolved when the tab is successfully refreshed. */ -var refreshTab = Task.async(function*(tab) { +var refreshTab = async function (tab = gBrowser.selectedTab) { info("Refreshing tab."); const finished = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser); - gBrowser.reloadTab(gBrowser.selectedTab); - yield finished; + gBrowser.reloadTab(tab); + await finished; info("Tab finished refreshing."); -}); +}; /** * Simulate a key event from a element. diff --git a/devtools/client/inspector/grids/test/browser_grids_restored-after-reload.js b/devtools/client/inspector/grids/test/browser_grids_restored-after-reload.js index fd3fff695423..17b2eaabad12 100644 --- a/devtools/client/inspector/grids/test/browser_grids_restored-after-reload.js +++ b/devtools/client/inspector/grids/test/browser_grids_restored-after-reload.js @@ -62,7 +62,7 @@ add_task(function* () { let onGridListRestored = waitUntilState(store, state => state.grids.length == 1 && state.grids[0].highlighted); - yield refreshTab(gBrowser.selectedTab); + yield refreshTab(); let { restored } = yield onStateRestored; yield onGridListRestored; diff --git a/devtools/client/inspector/rules/test/browser_rules_flexbox-highlighter-on-reload.js b/devtools/client/inspector/rules/test/browser_rules_flexbox-highlighter-on-reload.js index ff3145de2724..693a284c79f3 100644 --- a/devtools/client/inspector/rules/test/browser_rules_flexbox-highlighter-on-reload.js +++ b/devtools/client/inspector/rules/test/browser_rules_flexbox-highlighter-on-reload.js @@ -25,7 +25,7 @@ add_task(function* () { let target = TargetFactory.forTab(gBrowser.selectedTab); yield gDevTools.closeToolbox(target); - yield refreshTab(gBrowser.selectedTab); + yield refreshTab(); info("Check that the flexbox highlighter can be displayed after reloading the page."); yield checkFlexboxHighlighter(); diff --git a/devtools/client/inspector/rules/test/browser_rules_flexbox-highlighter-restored-after-reload.js b/devtools/client/inspector/rules/test/browser_rules_flexbox-highlighter-restored-after-reload.js index e70b48e3f55f..d099c93a0590 100644 --- a/devtools/client/inspector/rules/test/browser_rules_flexbox-highlighter-restored-after-reload.js +++ b/devtools/client/inspector/rules/test/browser_rules_flexbox-highlighter-restored-after-reload.js @@ -44,7 +44,7 @@ add_task(function* () { info("Reload the page, expect the highlighter to be displayed once again"); let onStateRestored = highlighters.once("flexbox-state-restored"); - yield refreshTab(gBrowser.selectedTab); + yield refreshTab(); let { restored } = yield onStateRestored; ok(restored, "The highlighter state was restored"); diff --git a/devtools/client/inspector/rules/test/browser_rules_grid-highlighter-on-reload.js b/devtools/client/inspector/rules/test/browser_rules_grid-highlighter-on-reload.js index 8ca9ce5fd8ef..44e51e639153 100644 --- a/devtools/client/inspector/rules/test/browser_rules_grid-highlighter-on-reload.js +++ b/devtools/client/inspector/rules/test/browser_rules_grid-highlighter-on-reload.js @@ -30,7 +30,7 @@ add_task(function* () { let target = TargetFactory.forTab(gBrowser.selectedTab); yield gDevTools.closeToolbox(target); - yield refreshTab(gBrowser.selectedTab); + yield refreshTab(); info("Check that the grid highlighter can be displayed after reloading the page"); yield checkGridHighlighter(); diff --git a/devtools/client/inspector/rules/test/browser_rules_grid-highlighter-restored-after-reload.js b/devtools/client/inspector/rules/test/browser_rules_grid-highlighter-restored-after-reload.js index 22ff7756f4f2..987cdce974e5 100644 --- a/devtools/client/inspector/rules/test/browser_rules_grid-highlighter-restored-after-reload.js +++ b/devtools/client/inspector/rules/test/browser_rules_grid-highlighter-restored-after-reload.js @@ -51,7 +51,7 @@ add_task(function* () { info("Reload the page, expect the highlighter to be displayed once again"); let onStateRestored = highlighters.once("grid-state-restored"); - yield refreshTab(gBrowser.selectedTab); + yield refreshTab(); let { restored } = yield onStateRestored; ok(restored, "The highlighter state was restored"); diff --git a/devtools/client/memory/test/browser/browser_memory_refresh_does_not_leak.js b/devtools/client/memory/test/browser/browser_memory_refresh_does_not_leak.js index 2f5ce8547f04..b25891d70e3a 100644 --- a/devtools/client/memory/test/browser/browser_memory_refresh_does_not_leak.js +++ b/devtools/client/memory/test/browser/browser_memory_refresh_does_not_leak.js @@ -58,7 +58,7 @@ this.test = makeMemoryTest(TEST_URL, function* ({ tab, panel }) { w.toString(16)).join(", ")); is(startWindows.length, 1); - yield refreshTab(tab); + yield refreshTab(); const endWindows = yield getWindowsInSnapshot(front); is(endWindows.length, 1);