From 8eae3ca20e116990b3e8072dd64c05ab669433f4 Mon Sep 17 00:00:00 2001 From: Jared Wein Date: Thu, 3 Nov 2016 18:29:08 -0400 Subject: [PATCH] Bug 1314474 - Enable no-shadow rule for eslint for browser/ mochitests. r=mossop MozReview-Commit-ID: 3QTChaVgCRP --HG-- extra : rebase_source : a7bd3f5b133a5dcecedbdf39ef3b1ce75a550970 --- .../test/general/browser_aboutAccounts.js | 8 ++-- .../test/general/browser_aboutHealthReport.js | 8 ++-- .../test/general/browser_audioTabIcon.js | 18 +++---- .../test/general/browser_bug1297539.js | 10 ++-- .../content/test/general/browser_bug491431.js | 8 ++-- .../content/test/general/browser_bug553455.js | 24 +++++----- .../content/test/general/browser_bug561636.js | 6 +-- .../content/test/general/browser_bug592338.js | 2 +- .../content/test/general/browser_bug676619.js | 8 ++-- .../content/test/general/browser_bug719271.js | 6 +-- .../general/browser_bug763468_perwindowpb.js | 8 ++-- .../general/browser_bug767836_perwindowpb.js | 4 +- .../content/test/general/browser_clipboard.js | 14 +++--- .../test/general/browser_contentSearchUI.js | 14 +++--- .../test/general/browser_contextmenu.js | 19 ++++---- .../test/general/browser_decoderDoctor.js | 4 +- .../content/test/general/browser_discovery.js | 48 +++++++++---------- .../general/browser_documentnavigation.js | 26 +++++----- .../general/browser_e10s_chrome_process.js | 4 +- .../test/general/browser_feed_discovery.js | 6 +-- .../test/general/browser_findbarClose.js | 4 +- .../general/browser_fullscreen-window-open.js | 6 +-- .../content/test/general/browser_fxa_oauth.js | 6 +-- .../test/general/browser_fxa_web_channel.js | 6 +-- .../test/general/browser_fxaccounts.js | 6 +-- .../test/general/browser_page_style_menu.js | 14 +++--- .../test/general/browser_popup_blocker.js | 2 +- .../test/general/browser_refreshBlocker.js | 4 +- .../test/general/browser_sanitizeDialog.js | 2 +- .../general/browser_save_link-perwindowpb.js | 12 ++--- ...browser_save_link_when_window_navigates.js | 8 ++-- .../test/general/browser_selectpopup.js | 30 ++++++------ .../content/test/general/browser_syncui.js | 6 +-- .../content/test/general/browser_tabfocus.js | 37 +++++++------- .../test/general/browser_web_channel.js | 20 ++++---- .../test/general/content_aboutAccounts.js | 12 ++--- .../test/general/contextmenu_common.js | 16 +++---- browser/base/content/test/general/head.js | 18 +++---- .../test_sts_privatebrowsing_perwindowpb.html | 14 +++--- testing/mochitest/mochitest.eslintrc.js | 1 + .../alerts/test/test_alerts_noobserve.html | 2 +- .../test/test_alerts_requireinteraction.html | 4 +- .../components/alerts/test/test_image.html | 12 ++--- .../alerts/test/test_multiple_alerts.html | 12 ++--- .../alerts/test/test_principal.html | 4 +- ...st_chrome_ext_background_debug_global.html | 2 +- .../test_chrome_ext_downloads_saveAs.html | 3 +- .../test_chrome_ext_storage_cleanup.html | 12 ++--- .../test_ext_content_security_policy.html | 8 ++-- .../test_ext_cookies_permissions.html | 16 +++---- .../test/mochitest/test_ext_i18n.html | 16 +++---- .../test/mochitest/test_ext_i18n_css.html | 4 +- .../mochitest/test_ext_permission_xhr.html | 8 ++-- .../mochitest/test_ext_storage_content.html | 6 +-- .../test/mochitest/test_ext_storage_tab.html | 4 +- .../test_ext_web_accessible_resources.html | 12 ++--- .../mochitest/test_ext_webrequest_upload.html | 4 +- .../browser/browser_DOMFormHasPassword.js | 18 +++---- .../browser/browser_DOMInputPasswordAdded.js | 20 ++++---- .../test/browser/browser_http_autofill.js | 24 +++++----- .../browser_insecurePasswordWarning.js | 6 +-- .../test/browser/browser_notifications.js | 8 ++-- .../browser/browser_notifications_password.js | 6 +-- .../test/browser/browser_passwordmgr_sort.js | 6 +-- .../test/browser/browser_passwordmgrdlg.js | 24 +++++----- .../passwordmgr/test/browser/head.js | 2 +- .../chrome/test_privbrowsing_perwindowpb.html | 4 +- .../test/mochitest/test_bug_627616.html | 30 ++++++------ .../test/mochitest/test_prompt_http.html | 5 +- .../test/mochitest/test_prompt_noWindow.html | 4 +- .../passwordmgr/test/pwmgr_common.js | 9 ++-- .../test/test_master_password.html | 12 ++--- .../passwordmgr/test/test_prompt_async.html | 16 +++---- .../test/unit/test_context_menu.js | 4 +- .../places/tests/bookmarks/test_bookmarks.js | 22 ++++----- ...owser_favicon_setAndFetchFaviconForPage.js | 12 ++--- ...icon_setAndFetchFaviconForPage_failures.js | 29 ++++++----- .../places/tests/browser/browser_redirect.js | 8 ++-- ...er_visituri_privatebrowsing_perwindowpb.js | 4 +- .../components/places/tests/browser/head.js | 2 +- .../expiration/test_annos_expire_policy.js | 2 +- .../tests/expiration/test_pref_interval.js | 2 - .../components/places/tests/head_common.js | 8 ++-- .../places/tests/history/test_remove.js | 12 ++--- .../places/tests/queries/head_queries.js | 8 ++-- .../tests/queries/test_results-as-visit.js | 2 +- .../places/tests/unit/test_408221.js | 2 +- .../places/tests/unit/test_415757.js | 2 +- .../tests/unit/test_async_transactions.js | 38 +++++++-------- .../places/tests/unit/test_bookmarks_html.js | 2 +- .../tests/unit/test_bookmarks_html_corrupt.js | 2 +- .../tests/unit/test_download_history.js | 18 +++---- .../places/tests/unit/test_getPlacesInfo.js | 2 +- .../unit/test_history_autocomplete_tags.js | 2 +- .../places/tests/unit/test_isURIVisited.js | 12 ++--- .../satchel/test/test_form_autocomplete.html | 6 +-- .../test_form_autocomplete_with_list.html | 6 +-- .../satchel/test/test_form_submission.html | 30 ++++++------ .../satchel/test/unit/test_autocomplete.js | 2 +- toolkit/content/tests/widgets/popup_shared.js | 4 +- toolkit/content/tests/widgets/tree_shared.js | 18 +++---- 101 files changed, 520 insertions(+), 533 deletions(-) diff --git a/browser/base/content/test/general/browser_aboutAccounts.js b/browser/base/content/test/general/browser_aboutAccounts.js index 2ba633b09e87..fd72a1608bf3 100644 --- a/browser/base/content/test/general/browser_aboutAccounts.js +++ b/browser/base/content/test/general/browser_aboutAccounts.js @@ -406,12 +406,12 @@ function test() waitForExplicitFinish(); Task.spawn(function* () { - for (let test of gTests) { - info(test.desc); + for (let testCase of gTests) { + info(testCase.desc); try { - yield test.run(); + yield testCase.run(); } finally { - yield test.teardown(); + yield testCase.teardown(); } } diff --git a/browser/base/content/test/general/browser_aboutHealthReport.js b/browser/base/content/test/general/browser_aboutHealthReport.js index bb2c40b25ab7..0be184fb8502 100644 --- a/browser/base/content/test/general/browser_aboutHealthReport.js +++ b/browser/base/content/test/general/browser_aboutHealthReport.js @@ -104,13 +104,13 @@ function test() requestLongerTimeout(10); Task.spawn(function* () { - for (let test of gTests) { - info(test.desc); - yield test.setup(); + for (let testCase of gTests) { + info(testCase.desc); + yield testCase.setup(); let iframe = yield promiseNewTabLoadEvent("about:healthreport"); - yield test.run(iframe); + yield testCase.run(iframe); gBrowser.removeCurrentTab(); } diff --git a/browser/base/content/test/general/browser_audioTabIcon.js b/browser/base/content/test/general/browser_audioTabIcon.js index 8f066ed1b145..4d7a7bbd834e 100644 --- a/browser/base/content/test/general/browser_audioTabIcon.js +++ b/browser/base/content/test/general/browser_audioTabIcon.js @@ -317,12 +317,12 @@ function* test_browser_swapping(tab, browser) { yield BrowserTestUtils.withNewTab({ gBrowser, url: "about:blank", - }, newBrowser => test_swapped_browser_while_not_playing(tab, newBrowser)); + }, secondAboutBlankBrowser => test_swapped_browser_while_not_playing(tab, secondAboutBlankBrowser)); }); } function* test_click_on_pinned_tab_after_mute() { - function* test_on_browser(browser) { + function* taskFn(browser) { let tab = gBrowser.getTabForBrowser(browser); gBrowser.selectedTab = originallySelectedTab; @@ -361,12 +361,12 @@ function* test_click_on_pinned_tab_after_mute() { yield BrowserTestUtils.withNewTab({ gBrowser, url: PAGE - }, test_on_browser); + }, taskFn); } // This test only does something useful in e10s! function* test_cross_process_load() { - function* test_on_browser(browser) { + function* taskFn(browser) { let tab = gBrowser.getTabForBrowser(browser); // Start playback and wait for it to finish. @@ -389,7 +389,7 @@ function* test_cross_process_load() { yield BrowserTestUtils.withNewTab({ gBrowser, url: PAGE - }, test_on_browser); + }, taskFn); } function* test_mute_keybinding() { @@ -401,7 +401,7 @@ function* test_mute_keybinding() { EventUtils.synthesizeKey("m", {ctrlKey: true}); yield mutedPromise; } - function* test_on_browser(browser) { + function* taskFn(browser) { let tab = gBrowser.getTabForBrowser(browser); // Make sure it's possible to mute before the tab is playing. @@ -434,7 +434,7 @@ function* test_mute_keybinding() { yield BrowserTestUtils.withNewTab({ gBrowser, url: PAGE - }, test_on_browser); + }, taskFn); } function* test_on_browser(browser) { @@ -462,7 +462,7 @@ function* test_on_browser(browser) { } function* test_delayed_tabattr_removal() { - function* test_on_browser(browser) { + function* taskFn(browser) { let tab = gBrowser.getTabForBrowser(browser); yield play(tab); @@ -476,7 +476,7 @@ function* test_delayed_tabattr_removal() { yield BrowserTestUtils.withNewTab({ gBrowser, url: PAGE - }, test_on_browser); + }, taskFn); } add_task(function*() { diff --git a/browser/base/content/test/general/browser_bug1297539.js b/browser/base/content/test/general/browser_bug1297539.js index 4cd4eaaf78bd..d7e6754375b7 100644 --- a/browser/base/content/test/general/browser_bug1297539.js +++ b/browser/base/content/test/general/browser_bug1297539.js @@ -42,11 +42,11 @@ function* cutCurrentSelection(elementQueryString, property, browser) { yield BrowserTestUtils.synthesizeKey("x", {accelKey: true}, browser); // The editor should be empty after cut. - yield ContentTask.spawn(browser, {elementQueryString, property}, - function* ({elementQueryString, property}) { - let element = content.document.querySelector(elementQueryString); - is(element[property], "", - `${elementQueryString} should be empty after cut (superkey + x)`); + yield ContentTask.spawn(browser, [elementQueryString, property], + function* ([contentElementQueryString, contentProperty]) { + let element = content.document.querySelector(contentElementQueryString); + is(element[contentProperty], "", + `${contentElementQueryString} should be empty after cut (superkey + x)`); }); } diff --git a/browser/base/content/test/general/browser_bug491431.js b/browser/base/content/test/general/browser_bug491431.js index d30e2ad125c4..d270e912eeb5 100644 --- a/browser/base/content/test/general/browser_bug491431.js +++ b/browser/base/content/test/general/browser_bug491431.js @@ -11,16 +11,16 @@ function test() { // test normal close tabA = gBrowser.addTab(testPage); - gBrowser.tabContainer.addEventListener("TabClose", function(aEvent) { + gBrowser.tabContainer.addEventListener("TabClose", function(firstTabCloseEvent) { gBrowser.tabContainer.removeEventListener("TabClose", arguments.callee, true); - ok(!aEvent.detail.adoptedBy, "This was a normal tab close"); + ok(!firstTabCloseEvent.detail.adoptedBy, "This was a normal tab close"); // test tab close by moving tabB = gBrowser.addTab(testPage); - gBrowser.tabContainer.addEventListener("TabClose", function(aEvent) { + gBrowser.tabContainer.addEventListener("TabClose", function(secondTabCloseEvent) { gBrowser.tabContainer.removeEventListener("TabClose", arguments.callee, true); executeSoon(function() { - ok(aEvent.detail.adoptedBy, "This was a tab closed by moving"); + ok(secondTabCloseEvent.detail.adoptedBy, "This was a tab closed by moving"); // cleanup newWin.close(); diff --git a/browser/base/content/test/general/browser_bug553455.js b/browser/base/content/test/general/browser_bug553455.js index 2c54939a13c0..4c97b4550927 100644 --- a/browser/base/content/test/general/browser_bug553455.js +++ b/browser/base/content/test/general/browser_bug553455.js @@ -13,8 +13,8 @@ const { REQUIRE_SIGNING } = Cu.import("resource://gre/modules/addons/AddonConsta const { Task } = Cu.import("resource://gre/modules/Task.jsm"); var rootDir = getRootDirectory(gTestPath); -var path = rootDir.split('/'); -var chromeName = path[0] + '//' + path[2]; +var rootPath = rootDir.split('/'); +var chromeName = rootPath[0] + '//' + rootPath[2]; var croot = chromeName + "/content/browser/toolkit/mozapps/extensions/test/xpinstall/"; var jar = getJar(croot); if (jar) { @@ -455,8 +455,8 @@ function test_restartless() { is(installs.length, 0, "Should be no pending installs"); let addon = yield new Promise(resolve => { - AddonManager.getAddonByID("restartless-xpi@tests.mozilla.org", addon => { - resolve(addon); + AddonManager.getAddonByID("restartless-xpi@tests.mozilla.org", result => { + resolve(result); }); }); addon.uninstall(); @@ -499,8 +499,8 @@ function test_multiple() { installs[0].cancel(); let addon = yield new Promise(resolve => { - AddonManager.getAddonByID("restartless-xpi@tests.mozilla.org", function (addon) { - resolve(addon); + AddonManager.getAddonByID("restartless-xpi@tests.mozilla.org", function (result) { + resolve(result); }); }); addon.uninstall(); @@ -676,8 +676,8 @@ function test_allUnverified() { yield notificationPromise; let addon = yield new Promise(resolve => { - AddonManager.getAddonByID("restartless-xpi@tests.mozilla.org", function(addon) { - resolve(addon); + AddonManager.getAddonByID("restartless-xpi@tests.mozilla.org", function(result) { + resolve(result); }); }); addon.uninstall(); @@ -919,8 +919,8 @@ function test_theme() { "Should have seen the right message"); let addon = yield new Promise(resolve => { - AddonManager.getAddonByID("{972ce4c6-7e08-4474-a285-3208198ce6fd}", function(addon) { - resolve(addon); + AddonManager.getAddonByID("{972ce4c6-7e08-4474-a285-3208198ce6fd}", function(result) { + resolve(result); }); }); ok(addon.userDisabled, "Should be switching away from the default theme."); @@ -928,8 +928,8 @@ function test_theme() { addon.userDisabled = false; addon = yield new Promise(resolve => { - AddonManager.getAddonByID("theme-xpi@tests.mozilla.org", function(addon) { - resolve(addon); + AddonManager.getAddonByID("theme-xpi@tests.mozilla.org", function(result) { + resolve(result); }); }); isnot(addon, null, "Test theme will have been installed"); diff --git a/browser/base/content/test/general/browser_bug561636.js b/browser/base/content/test/general/browser_bug561636.js index 6fb321699599..69bc475c38dd 100644 --- a/browser/base/content/test/general/browser_bug561636.js +++ b/browser/base/content/test/general/browser_bug561636.js @@ -74,7 +74,7 @@ function* blurChildElement(browser) function* checkChildFocus(browser, message) { yield ContentTask.spawn(browser, [message, testId], function* (args) { - let [msg, testId] = args; + let [msg, id] = args; var focused = content.document.activeElement == content.document.getElementById('i'); var validMsg = true; @@ -82,8 +82,8 @@ function* checkChildFocus(browser, message) validMsg = (msg == content.document.getElementById('i').validationMessage); } - Assert.equal(focused, true, "Test " + testId + " First invalid element should be focused"); - Assert.equal(validMsg, true, "Test " + testId + " The panel should show the message from validationMessage"); + Assert.equal(focused, true, "Test " + id + " First invalid element should be focused"); + Assert.equal(validMsg, true, "Test " + id + " The panel should show the message from validationMessage"); }); } diff --git a/browser/base/content/test/general/browser_bug592338.js b/browser/base/content/test/general/browser_bug592338.js index 5a87528fa45b..ca9cc361a84e 100644 --- a/browser/base/content/test/general/browser_bug592338.js +++ b/browser/base/content/test/general/browser_bug592338.js @@ -144,7 +144,7 @@ function test() { AddonManager.getInstallForURL(TESTROOT + "theme.xpi", function(aInstall) { aInstall.addListener({ - onInstallEnded: function(aInstall, aAddon) { + onInstallEnded: function() { AddonManager.getAddonByID("theme-xpi@tests.mozilla.org", function(aAddon) { isnot(aAddon, null, "Should have installed the test theme."); diff --git a/browser/base/content/test/general/browser_bug676619.js b/browser/base/content/test/general/browser_bug676619.js index f560eb2d4a0b..6b596481d4fc 100644 --- a/browser/base/content/test/general/browser_bug676619.js +++ b/browser/base/content/test/general/browser_bug676619.js @@ -12,8 +12,8 @@ function test () { next(); }); - ContentTask.spawn(gBrowser.selectedBrowser, link, link => { - content.document.getElementById(link).click(); + ContentTask.spawn(gBrowser.selectedBrowser, link, contentLink => { + content.document.getElementById(contentLink).click(); }); } @@ -29,8 +29,8 @@ function test () { }); }); - ContentTask.spawn(gBrowser.selectedBrowser, link, link => { - content.document.getElementById(link).click(); + ContentTask.spawn(gBrowser.selectedBrowser, link, contentLink => { + content.document.getElementById(contentLink).click(); }); } diff --git a/browser/base/content/test/general/browser_bug719271.js b/browser/base/content/test/general/browser_bug719271.js index 876038c0cc4a..1964ac6589cf 100644 --- a/browser/base/content/test/general/browser_bug719271.js +++ b/browser/base/content/test/general/browser_bug719271.js @@ -6,7 +6,7 @@ const TEST_PAGE = "http://example.org/browser/browser/base/content/test/general/zoom_test.html"; const TEST_VIDEO = "http://example.org/browser/browser/base/content/test/general/video.ogg"; -var gTab1, gTab2, gLevel1, gLevel2; +var gTab1, gTab2, gLevel1; function test() { waitForExplicitFinish(); @@ -44,9 +44,9 @@ function zoomTab2() { is(gBrowser.selectedTab, gTab2, "Tab 2 is selected"); FullZoom.reduce(); - let gLevel2 = ZoomManager.getZoomForBrowser(gBrowser.getBrowserForTab(gTab2)); + let level2 = ZoomManager.getZoomForBrowser(gBrowser.getBrowserForTab(gTab2)); - ok(gLevel2 < 1, "New zoom for tab 2 should be less than 1"); + ok(level2 < 1, "New zoom for tab 2 should be less than 1"); FullZoomHelper.zoomTest(gTab1, gLevel1, "Zooming tab 2 should not affect tab 1"); yield FullZoomHelper.selectTabAndWaitForLocationChange(gTab1); diff --git a/browser/base/content/test/general/browser_bug763468_perwindowpb.js b/browser/base/content/test/general/browser_bug763468_perwindowpb.js index f4124d9ef3ae..23cb14b8cd6e 100644 --- a/browser/base/content/test/general/browser_bug763468_perwindowpb.js +++ b/browser/base/content/test/general/browser_bug763468_perwindowpb.js @@ -57,11 +57,11 @@ function test() { testOnWindow({}, function(aWin) { doTest(false, aWin, function() { // then test when on private mode - testOnWindow({private: true}, function(aWin) { - doTest(true, aWin, function() { + testOnWindow({private: true}, function(aWin2) { + doTest(true, aWin2, function() { // then test again when not on private mode - testOnWindow({}, function(aWin) { - doTest(false, aWin, finish); + testOnWindow({}, function(aWin3) { + doTest(false, aWin3, finish); }); }); }); diff --git a/browser/base/content/test/general/browser_bug767836_perwindowpb.js b/browser/base/content/test/general/browser_bug767836_perwindowpb.js index 734981c0702d..7f5d15e76fd9 100644 --- a/browser/base/content/test/general/browser_bug767836_perwindowpb.js +++ b/browser/base/content/test/general/browser_bug767836_perwindowpb.js @@ -64,8 +64,8 @@ function test() { testOnWindow(false, function(aWindow) { doTest(false, aWindow, function() { // test private mode - testOnWindow(true, function(aWindow) { - doTest(true, aWindow, function() { + testOnWindow(true, function(aWindow2) { + doTest(true, aWindow2, function() { finish(); }); }); diff --git a/browser/base/content/test/general/browser_clipboard.js b/browser/base/content/test/general/browser_clipboard.js index a9908ff5169b..33c6de52dca1 100644 --- a/browser/base/content/test/general/browser_clipboard.js +++ b/browser/base/content/test/general/browser_clipboard.js @@ -32,12 +32,11 @@ add_task(function*() { const utils = content.QueryInterface(Components.interfaces.nsIInterfaceRequestor) .getInterface(Components.interfaces.nsIDOMWindowUtils); - const modifier = arg.modifier; function sendKey(key) { - if (utils.sendKeyEvent("keydown", key, 0, modifier)) { - utils.sendKeyEvent("keypress", key, key.charCodeAt(0), modifier); + if (utils.sendKeyEvent("keydown", key, 0, arg.modifier)) { + utils.sendKeyEvent("keypress", key, key.charCodeAt(0), arg.modifier); } - utils.sendKeyEvent("keyup", key, 0, modifier); + utils.sendKeyEvent("keyup", key, 0, arg.modifier); } // Select an area of the text. @@ -158,11 +157,10 @@ add_task(function*() { const utils = content.QueryInterface(Components.interfaces.nsIInterfaceRequestor) .getInterface(Components.interfaces.nsIDOMWindowUtils); - const modifier = arg.modifier; - if (utils.sendKeyEvent("keydown", "v", 0, modifier)) { - utils.sendKeyEvent("keypress", "v", "v".charCodeAt(0), modifier); + if (utils.sendKeyEvent("keydown", "v", 0, arg.modifier)) { + utils.sendKeyEvent("keypress", "v", "v".charCodeAt(0), arg.modifier); } - utils.sendKeyEvent("keyup", "v", 0, modifier); + utils.sendKeyEvent("keyup", "v", 0, arg.modifier); }); // The new content should now include an image. diff --git a/browser/base/content/test/general/browser_contentSearchUI.js b/browser/base/content/test/general/browser_contentSearchUI.js index 7d7389fd5b43..76fb603e59eb 100644 --- a/browser/base/content/test/general/browser_contentSearchUI.js +++ b/browser/base/content/test/general/browser_contentSearchUI.js @@ -666,12 +666,12 @@ function msg(type, data=null) { data: data, }); let deferred = Promise.defer(); - gMsgMan.addMessageListener(TEST_MSG, function onMsg(msg) { - if (msg.data.type != type) { + gMsgMan.addMessageListener(TEST_MSG, function onMsg(msgObj) { + if (msgObj.data.type != type) { return; } gMsgMan.removeMessageListener(TEST_MSG, onMsg); - deferred.resolve(msg.data.data); + deferred.resolve(msgObj.data.data); }); return deferred.promise; } @@ -742,11 +742,11 @@ function promiseTab() { function promiseMsg(name, type, msgMan) { let deferred = Promise.defer(); info("Waiting for " + name + " message " + type + "..."); - msgMan.addMessageListener(name, function onMsg(msg) { - info("Received " + name + " message " + msg.data.type + "\n"); - if (msg.data.type == type) { + msgMan.addMessageListener(name, function onMsg(msgObj) { + info("Received " + name + " message " + msgObj.data.type + "\n"); + if (msgObj.data.type == type) { msgMan.removeMessageListener(name, onMsg); - deferred.resolve(msg); + deferred.resolve(msgObj); } }); return deferred.promise; diff --git a/browser/base/content/test/general/browser_contextmenu.js b/browser/base/content/test/general/browser_contextmenu.js index a06a24d53e1c..a6200277bf6c 100644 --- a/browser/base/content/test/general/browser_contextmenu.js +++ b/browser/base/content/test/general/browser_contextmenu.js @@ -888,11 +888,12 @@ add_task(function* test_plaintext_sendpagetodevice() { } const oldGetter = setupRemoteClientsFixture(remoteClientsFixture); - let plainTextItems = ["context-navigation", null, - ["context-back", false, - "context-forward", false, - "context-reload", true, - "context-bookmarkpage", true], null, + let plainTextItemsWithSendPage = + ["context-navigation", null, + ["context-back", false, + "context-forward", false, + "context-reload", true, + "context-bookmarkpage", true], null, "---", null, "context-savepage", true, ...(hasPocket ? ["context-pocket", true] : []), @@ -909,7 +910,7 @@ add_task(function* test_plaintext_sendpagetodevice() { "context-viewsource", true, "context-viewinfo", true ]; - yield test_contextmenu("#test-text", plainTextItems, { + yield test_contextmenu("#test-text", plainTextItemsWithSendPage, { *onContextMenuShown() { yield openMenuItemSubmenu("context-sendpagetodevice"); } @@ -966,13 +967,13 @@ add_task(function* test_cleanup_html() { * the element that will be referenced. */ function* selectText(selector) { - yield ContentTask.spawn(gBrowser.selectedBrowser, selector, function*(selector) { - info(`Selecting text of ${selector}`); + yield ContentTask.spawn(gBrowser.selectedBrowser, selector, function*(contentSelector) { + info(`Selecting text of ${contentSelector}`); let doc = content.document; let win = doc.defaultView; win.getSelection().removeAllRanges(); let div = doc.createRange(); - let element = doc.querySelector(selector); + let element = doc.querySelector(contentSelector); Assert.ok(element, "Found element to select text from"); div.setStartBefore(element); div.setEndAfter(element); diff --git a/browser/base/content/test/general/browser_decoderDoctor.js b/browser/base/content/test/general/browser_decoderDoctor.js index 1d9837e89900..a379721608f9 100644 --- a/browser/base/content/test/general/browser_decoderDoctor.js +++ b/browser/base/content/test/general/browser_decoderDoctor.js @@ -5,10 +5,10 @@ function* test_decoder_doctor_notification(type, notificationMessage, options) { let awaitNotificationBar = BrowserTestUtils.waitForNotificationBar(gBrowser, browser, "decoder-doctor-notification"); - yield ContentTask.spawn(browser, type, function*(type) { + yield ContentTask.spawn(browser, type, function*(aType) { Services.obs.notifyObservers(content.window, "decoder-doctor-notification", - JSON.stringify({type: type, + JSON.stringify({type: aType, isSolved: false, decoderDoctorReportId: "test", formats: "test"})); diff --git a/browser/base/content/test/general/browser_discovery.js b/browser/base/content/test/general/browser_discovery.js index 3d07f9743f1c..23d44c6a9b09 100644 --- a/browser/base/content/test/general/browser_discovery.js +++ b/browser/base/content/test/general/browser_discovery.js @@ -36,13 +36,13 @@ var iconDiscoveryTests = [ ]; function runIconDiscoveryTest() { - var test = iconDiscoveryTests[0]; + var testCase = iconDiscoveryTests[0]; var head = doc().getElementById("linkparent"); var hasSrc = gBrowser.getIcon() != null; - if (test.pass) - ok(hasSrc, test.text); + if (testCase.pass) + ok(hasSrc, testCase.text); else - ok(!hasSrc, test.text); + ok(!hasSrc, testCase.text); head.removeChild(head.getElementsByTagName('link')[0]); iconDiscoveryTests.shift(); @@ -55,16 +55,16 @@ function iconDiscovery() { gBrowser.setIcon(gBrowser.selectedTab, null, Services.scriptSecurityManager.getSystemPrincipal()); - var test = iconDiscoveryTests[0]; + var testCase = iconDiscoveryTests[0]; var head = doc().getElementById("linkparent"); var link = doc().createElement("link"); var rootDir = getRootDirectory(gTestPath); - var rel = test.rel || "icon"; - var href = test.href || rootDir + "moz.png"; - var type = test.type || "image/png"; - if (test.pass == undefined) - test.pass = true; + var rel = testCase.rel || "icon"; + var href = testCase.href || rootDir + "moz.png"; + var type = testCase.type || "image/png"; + if (testCase.pass == undefined) + testCase.pass = true; link.rel = rel; link.href = href; @@ -92,17 +92,17 @@ var searchDiscoveryTests = [ ]; function runSearchDiscoveryTest() { - var test = searchDiscoveryTests[0]; - var title = test.title || searchDiscoveryTests.length; + var testCase = searchDiscoveryTests[0]; + var title = testCase.title || searchDiscoveryTests.length; if (browser.engines) { - var hasEngine = (test.count) ? (browser.engines[0].title == title && - browser.engines.length == test.count) : - (browser.engines[0].title == title); - ok(hasEngine, test.text); + var hasEngine = (testCase.count) ? (browser.engines[0].title == title && + browser.engines.length == testCase.count) : + (browser.engines[0].title == title); + ok(hasEngine, testCase.text); browser.engines = null; } else - ok(!test.pass, test.text); + ok(!testCase.pass, testCase.text); searchDiscoveryTests.shift(); searchDiscovery(); // Run the next test. @@ -129,15 +129,15 @@ function searchDiscovery() { if (searchDiscoveryTests.length) { setHandlerFunc(runSearchDiscoveryTest); - let test = searchDiscoveryTests[0]; + let testCase = searchDiscoveryTests[0]; let link = doc().createElement("link"); - let rel = test.rel || "search"; - let href = test.href || "http://so.not.here.mozilla.com/search.xml"; - let type = test.type || "application/opensearchdescription+xml"; - let title = test.title || searchDiscoveryTests.length; - if (test.pass == undefined) - test.pass = true; + let rel = testCase.rel || "search"; + let href = testCase.href || "http://so.not.here.mozilla.com/search.xml"; + let type = testCase.type || "application/opensearchdescription+xml"; + let title = testCase.title || searchDiscoveryTests.length; + if (testCase.pass == undefined) + testCase.pass = true; link.rel = rel; link.href = href; diff --git a/browser/base/content/test/general/browser_documentnavigation.js b/browser/base/content/test/general/browser_documentnavigation.js index 6ea49758f1ae..eb789d0766a9 100644 --- a/browser/base/content/test/general/browser_documentnavigation.js +++ b/browser/base/content/test/general/browser_documentnavigation.js @@ -30,34 +30,34 @@ function* expectFocusOnF6(backward, expectedDocument, expectedElement, onContent messageManager.addMessageListener("BrowserTest:FocusChanged", focusChangedListener); yield ContentTask.spawn(gBrowser.selectedBrowser, { expectedElementId: expectedElement }, function* (arg) { - let expectedElement = content.document.getElementById(arg.expectedElementId); - if (!expectedElement) { + let contentExpectedElement = content.document.getElementById(arg.expectedElementId); + if (!contentExpectedElement) { // Element not found, so look in the child frames. for (let f = 0; f < content.frames.length; f++) { if (content.frames[f].document.getElementById(arg.expectedElementId)) { - expectedElement = content.frames[f].document; + contentExpectedElement = content.frames[f].document; break; } } } - else if (expectedElement.localName == "html") { - expectedElement = expectedElement.ownerDocument; + else if (contentExpectedElement.localName == "html") { + contentExpectedElement = contentExpectedElement.ownerDocument; } - if (!expectedElement) { + if (!contentExpectedElement) { sendSyncMessage("BrowserTest:FocusChanged", { details : "expected element " + arg.expectedElementId + " not found" }); return; } - expectedElement.addEventListener("focus", function focusReceived() { - expectedElement.removeEventListener("focus", focusReceived, true); + contentExpectedElement.addEventListener("focus", function focusReceived() { + contentExpectedElement.removeEventListener("focus", focusReceived, true); - const fm = Components.classes["@mozilla.org/focus-manager;1"]. - getService(Components.interfaces.nsIFocusManager); - let details = fm.focusedWindow.document.documentElement.id; - if (fm.focusedElement) { - details += "," + fm.focusedElement.id; + const contentFM = Components.classes["@mozilla.org/focus-manager;1"]. + getService(Components.interfaces.nsIFocusManager); + let details = contentFM.focusedWindow.document.documentElement.id; + if (contentFM.focusedElement) { + details += "," + contentFM.focusedElement.id; } sendSyncMessage("BrowserTest:FocusChanged", { details : details }); diff --git a/browser/base/content/test/general/browser_e10s_chrome_process.js b/browser/base/content/test/general/browser_e10s_chrome_process.js index dfe27fec03e0..0726447ce85c 100644 --- a/browser/base/content/test/general/browser_e10s_chrome_process.js +++ b/browser/base/content/test/general/browser_e10s_chrome_process.js @@ -131,8 +131,8 @@ function* loadURI(browser, uri) { function* clickLink(browser, uri) { info("Clicking link"); - function frame_script(uri) { - let link = content.document.querySelector("a[href='" + uri + "']"); + function frame_script(frameUri) { + let link = content.document.querySelector("a[href='" + frameUri + "']"); link.click(); } diff --git a/browser/base/content/test/general/browser_feed_discovery.js b/browser/base/content/test/general/browser_feed_discovery.js index dd023d469612..73dcef755cbc 100644 --- a/browser/base/content/test/general/browser_feed_discovery.js +++ b/browser/base/content/test/general/browser_feed_discovery.js @@ -18,14 +18,14 @@ add_task(function* () { feeds[aFeed.href] = true; } - yield ContentTask.spawn(browser, feeds, function* (feeds) { + yield ContentTask.spawn(browser, feeds, function* (contentFeeds) { for (let aLink of content.document.getElementsByTagName("link")) { // ignore real stylesheets, and anything without an href property if (aLink.type != "text/css" && aLink.href) { if (/bogus/i.test(aLink.title)) { - ok(!feeds[aLink.href], "don't discover " + aLink.href); + ok(!contentFeeds[aLink.href], "don't discover " + aLink.href); } else { - ok(feeds[aLink.href], "should discover " + aLink.href); + ok(contentFeeds[aLink.href], "should discover " + aLink.href); } } } diff --git a/browser/base/content/test/general/browser_findbarClose.js b/browser/base/content/test/general/browser_findbarClose.js index 5f8d36f9bdbf..53503073c07a 100644 --- a/browser/base/content/test/general/browser_findbarClose.js +++ b/browser/base/content/test/general/browser_findbarClose.js @@ -20,9 +20,9 @@ add_task(function* findbar_test() { yield new ContentTask.spawn(newTab.linkedBrowser, null, function* () { let iframe = content.document.getElementById("iframe"); - let promise = ContentTaskUtils.waitForEvent(iframe, "load", false); + let awaitLoad = ContentTaskUtils.waitForEvent(iframe, "load", false); iframe.src = "http://example.org/"; - yield promise; + yield awaitLoad; }); ok(!gFindBar.hidden, "the Find bar isn't hidden after the location of a " + diff --git a/browser/base/content/test/general/browser_fullscreen-window-open.js b/browser/base/content/test/general/browser_fullscreen-window-open.js index 4c460ab6b62b..2624b754a221 100644 --- a/browser/base/content/test/general/browser_fullscreen-window-open.js +++ b/browser/base/content/test/general/browser_fullscreen-window-open.js @@ -49,9 +49,9 @@ var gTests = [ ]; function runNextTest () { - let test = gTests.shift(); - if (test) { - executeSoon(test); + let testCase = gTests.shift(); + if (testCase) { + executeSoon(testCase); } else { finish(); diff --git a/browser/base/content/test/general/browser_fxa_oauth.js b/browser/base/content/test/general/browser_fxa_oauth.js index 7d2505775eca..1f688bfa8f8e 100644 --- a/browser/base/content/test/general/browser_fxa_oauth.js +++ b/browser/base/content/test/general/browser_fxa_oauth.js @@ -313,9 +313,9 @@ function test() { let newWhitelist = origWhitelist + " http://example.com"; Services.prefs.setCharPref(webchannelWhitelistPref, newWhitelist); try { - for (let test of gTests) { - info("Running: " + test.desc); - yield test.run(); + for (let testCase of gTests) { + info("Running: " + testCase.desc); + yield testCase.run(); } } finally { Services.prefs.clearUserPref(webchannelWhitelistPref); diff --git a/browser/base/content/test/general/browser_fxa_web_channel.js b/browser/base/content/test/general/browser_fxa_web_channel.js index 9a23a8a14601..eb0167ffb9f8 100644 --- a/browser/base/content/test/general/browser_fxa_web_channel.js +++ b/browser/base/content/test/general/browser_fxa_web_channel.js @@ -199,9 +199,9 @@ function test() { waitForExplicitFinish(); Task.spawn(function* () { - for (let test of gTests) { - info("Running: " + test.desc); - yield test.run(); + for (let testCase of gTests) { + info("Running: " + testCase.desc); + yield testCase.run(); } }).then(finish, ex => { Assert.ok(false, "Unexpected Exception: " + ex); diff --git a/browser/base/content/test/general/browser_fxaccounts.js b/browser/base/content/test/general/browser_fxaccounts.js index 3466e5214ea1..cc7abad9ffdb 100644 --- a/browser/base/content/test/general/browser_fxaccounts.js +++ b/browser/base/content/test/general/browser_fxaccounts.js @@ -183,10 +183,10 @@ function configureProfileURL(profile, responseStatus = 200) { function promiseObserver(topic, count = 1) { return new Promise(resolve => { - let obs = (subject, topic, data) => { + let obs = (aSubject, aTopic, aData) => { if (--count == 0) { - Services.obs.removeObserver(obs, topic); - resolve(subject); + Services.obs.removeObserver(obs, aTopic); + resolve(aSubject); } } Services.obs.addObserver(obs, topic, false); diff --git a/browser/base/content/test/general/browser_page_style_menu.js b/browser/base/content/test/general/browser_page_style_menu.js index cc9d76327a90..cb080d52af25 100644 --- a/browser/base/content/test/general/browser_page_style_menu.js +++ b/browser/base/content/test/general/browser_page_style_menu.js @@ -50,8 +50,8 @@ add_task(function*() { checked: el.getAttribute("checked") == "true", })); - let validLinks = yield ContentTask.spawn(gBrowser.selectedBrowser, items, function(items) { - let validLinks = 0; + let validLinks = yield ContentTask.spawn(gBrowser.selectedBrowser, items, function(contentItems) { + let contentValidLinks = 0; Array.forEach(content.document.querySelectorAll("link, style"), function (el) { var title = el.getAttribute("title"); var rel = el.getAttribute("rel"); @@ -60,7 +60,7 @@ add_task(function*() { " with rel=\"" + rel + "\"" + (media ? " and media=\"" + media + "\"" : ""); - var item = items.filter(item => item.label == title); + var item = contentItems.filter(aItem => aItem.label == title); var found = item.length == 1; var checked = found && item[0].checked; @@ -69,17 +69,17 @@ add_task(function*() { ok(!found, idstring + " should not show up in page style menu"); break; case "0-todo": - validLinks++; + contentValidLinks++; todo(!found, idstring + " should not show up in page style menu"); ok(!checked, idstring + " should not be selected"); break; case "1": - validLinks++; + contentValidLinks++; ok(found, idstring + " should show up in page style menu"); ok(!checked, idstring + " should not be selected"); break; case "2": - validLinks++; + contentValidLinks++; ok(found, idstring + " should show up in page style menu"); ok(checked, idstring + " should be selected"); break; @@ -87,7 +87,7 @@ add_task(function*() { throw "data-state attribute is missing or has invalid value"; } }); - return validLinks; + return contentValidLinks; }); ok(items.length, "At least one item in the menu"); diff --git a/browser/base/content/test/general/browser_popup_blocker.js b/browser/base/content/test/general/browser_popup_blocker.js index 6593e1d43276..82f76e00bc51 100644 --- a/browser/base/content/test/general/browser_popup_blocker.js +++ b/browser/base/content/test/general/browser_popup_blocker.js @@ -53,7 +53,7 @@ function test() { allow.doCommand(); yield promiseWaitForCondition(() => popupTabs.length == 2 && - popupTabs.every(tab => tab.linkedBrowser.currentURI.spec != "about:blank")); + popupTabs.every(aTab => aTab.linkedBrowser.currentURI.spec != "about:blank")); gBrowser.tabContainer.removeEventListener("TabOpen", onTabOpen); diff --git a/browser/base/content/test/general/browser_refreshBlocker.js b/browser/base/content/test/general/browser_refreshBlocker.js index a56d6edb1e66..ee274f2c23e1 100644 --- a/browser/base/content/test/general/browser_refreshBlocker.js +++ b/browser/base/content/test/general/browser_refreshBlocker.js @@ -17,12 +17,12 @@ const PREF = "accessibility.blockautorefresh"; * @returns Promise */ function* attemptFakeRefresh(browser, expectRefresh) { - yield ContentTask.spawn(browser, expectRefresh, function*(expectRefresh) { + yield ContentTask.spawn(browser, expectRefresh, function*(contentExpectRefresh) { let URI = docShell.QueryInterface(Ci.nsIWebNavigation).currentURI; let refresher = docShell.QueryInterface(Ci.nsIRefreshURI); refresher.refreshURI(URI, 0, false, true); - Assert.equal(refresher.refreshPending, expectRefresh, + Assert.equal(refresher.refreshPending, contentExpectRefresh, "Got the right refreshPending state"); if (refresher.refreshPending) { diff --git a/browser/base/content/test/general/browser_sanitizeDialog.js b/browser/base/content/test/general/browser_sanitizeDialog.js index 54b6d0cf1c92..84f4837482c3 100644 --- a/browser/base/content/test/general/browser_sanitizeDialog.js +++ b/browser/base/content/test/general/browser_sanitizeDialog.js @@ -584,7 +584,7 @@ add_task(function* test_offline_cache() { var cacheListener = { onCacheEntryCheck: function() { return Ci.nsICacheEntryOpenCallback.ENTRY_WANTED; }, - onCacheEntryAvailable: function (entry, isnew, appcache, status) { + onCacheEntryAvailable: function (entry, isnew, unused, status) { is(status, Cr.NS_OK); var stream = entry.openOutputStream(0); var content = "content"; diff --git a/browser/base/content/test/general/browser_save_link-perwindowpb.js b/browser/base/content/test/general/browser_save_link-perwindowpb.js index 1bffd8c5f06b..5c99ba32ae76 100644 --- a/browser/base/content/test/general/browser_save_link-perwindowpb.js +++ b/browser/base/content/test/general/browser_save_link-perwindowpb.js @@ -64,9 +64,9 @@ function triggerSave(aWindow, aCallback) { info("popup hidden"); } - function onTransferComplete(aWindow, downloadSuccess, destDir) { + function onTransferComplete(aWindow2, downloadSuccess, destDir) { ok(downloadSuccess, "Link should have been downloaded successfully"); - aWindow.close(); + aWindow2.close(); executeSoon(() => aCallback()); } @@ -86,10 +86,10 @@ function test() { function whenDelayedStartupFinished(aWindow, aCallback) { info("whenDelayedStartupFinished"); - Services.obs.addObserver(function observer(aSubject, aTopic) { + Services.obs.addObserver(function obs(aSubject, aTopic) { info("whenDelayedStartupFinished, got topic: " + aTopic + ", got subject: " + aSubject + ", waiting for " + aWindow); if (aWindow == aSubject) { - Services.obs.removeObserver(observer, aTopic); + Services.obs.removeObserver(obs, aTopic); executeSoon(aCallback); info("whenDelayedStartupFinished found our window"); } @@ -170,8 +170,8 @@ function test() { is(gNumSet, 1, "1 cookie should be set"); // The second save from a private window also sets a cookie. - testOnWindow({private: true}, function(win) { - triggerSave(win, function() { + testOnWindow({private: true}, function(win2) { + triggerSave(win2, function() { is(gNumSet, 2, "2 cookies should be set"); finish(); }); diff --git a/browser/base/content/test/general/browser_save_link_when_window_navigates.js b/browser/base/content/test/general/browser_save_link_when_window_navigates.js index b92be274be5c..2fd10b00e287 100644 --- a/browser/base/content/test/general/browser_save_link_when_window_navigates.js +++ b/browser/base/content/test/general/browser_save_link_when_window_navigates.js @@ -80,9 +80,9 @@ function triggerSave(aWindow, aCallback) { ok(false, "No Unknown Content Type dialog yet?"); } - function onTransferComplete(aWindow, downloadSuccess, destDir) { + function onTransferComplete(aWindow2, downloadSuccess) { ok(downloadSuccess, "Link should have been downloaded successfully"); - aWindow.close(); + aWindow2.close(); executeSoon(aCallback); } @@ -163,8 +163,8 @@ function test() { triggerSave(win, function() { windowGonePromise.then(function() { Services.prefs.setBoolPref(SAVE_PER_SITE_PREF, false); - testOnWindow(undefined, function(win) { - triggerSave(win, finish); + testOnWindow(undefined, function(win2) { + triggerSave(win2, finish); }); }); }); diff --git a/browser/base/content/test/general/browser_selectpopup.js b/browser/base/content/test/general/browser_selectpopup.js index 873eb697d58e..b6b3a8ae6819 100644 --- a/browser/base/content/test/general/browser_selectpopup.js +++ b/browser/base/content/test/general/browser_selectpopup.js @@ -270,17 +270,17 @@ add_task(function*() { for (let stepIndex = 0; stepIndex < steps.length; stepIndex++) { let step = steps[stepIndex]; - yield ContentTask.spawn(gBrowser.selectedBrowser, step, function*(step) { + yield ContentTask.spawn(gBrowser.selectedBrowser, step, function*(contentStep) { return new Promise(resolve => { let changedWin = content; let elem; - if (step[0] == "select") { + if (contentStep[0] == "select") { changedWin = content.document.getElementById("frame").contentWindow; elem = changedWin.document.getElementById("select"); } else { - elem = content.document.getElementById(step[0]); + elem = content.document.getElementById(contentStep[0]); } changedWin.addEventListener("MozAfterPaint", function onPaint() { @@ -288,7 +288,7 @@ add_task(function*() { resolve(); }); - elem.style = step[1]; + elem.style = contentStep[1]; }); }); @@ -297,9 +297,9 @@ add_task(function*() { expectedX += step[2]; expectedY += step[3]; - let rect = selectPopup.getBoundingClientRect(); - is(rect.left, expectedX, "step " + (stepIndex + 1) + " x"); - is(rect.top, expectedY, "step " + (stepIndex + 1) + " y"); + let popupRect = selectPopup.getBoundingClientRect(); + is(popupRect.left, expectedX, "step " + (stepIndex + 1) + " x"); + is(popupRect.top, expectedY, "step " + (stepIndex + 1) + " y"); yield hideSelectPopup(selectPopup); } @@ -365,14 +365,12 @@ add_task(function* test_event_order() { let expected = mode == "enter" ? expectedEnter : expectedClick; yield openSelectPopup(selectPopup, true, mode == "enter" ? "#one" : "#two"); - let eventsPromise = ContentTask.spawn(browser, { mode, expected }, function*(args) { - let expected = args.expected; - + let eventsPromise = ContentTask.spawn(browser, [mode, expected], function*([contentMode, contentExpected]) { return new Promise((resolve) => { function onEvent(event) { select.removeEventListener(event.type, onEvent); - Assert.ok(expected.length, "Unexpected event " + event.type); - let expectation = expected.shift(); + Assert.ok(contentExpected.length, "Unexpected event " + event.type); + let expectation = contentExpected.shift(); Assert.equal(event.type, expectation.type, "Expected the right event order"); Assert.ok(event.bubbles, "All of these events should bubble"); @@ -381,12 +379,12 @@ add_task(function* test_event_order() { Assert.equal(event.target.localName, expectation.targetIsOption ? "option" : "select", "Target matches"); - if (!expected.length) { + if (!contentExpected.length) { resolve(); } } - let select = content.document.getElementById(args.mode == "enter" ? "one" : "two"); + let select = content.document.getElementById(contentMode == "enter" ? "one" : "two"); for (let event of ["input", "change", "mousedown", "mouseup", "click"]) { select.addEventListener(event, onEvent); } @@ -450,9 +448,9 @@ function* performLargePopupTests(win) } let contentPainted = BrowserTestUtils.contentPainted(browser); - yield ContentTask.spawn(browser, position, function*(position) { + yield ContentTask.spawn(browser, position, function*(contentPosition) { let select = content.document.getElementById("one"); - select.setAttribute("style", position); + select.setAttribute("style", contentPosition); }); yield contentPainted; } diff --git a/browser/base/content/test/general/browser_syncui.js b/browser/base/content/test/general/browser_syncui.js index 250f65c97982..daf0fa49733e 100644 --- a/browser/base/content/test/general/browser_syncui.js +++ b/browser/base/content/test/general/browser_syncui.js @@ -44,9 +44,9 @@ function checkBroadcasterVisible(broadcasterId) { function promiseObserver(topic) { return new Promise(resolve => { - let obs = (subject, topic, data) => { - Services.obs.removeObserver(obs, topic); - resolve(subject); + let obs = (aSubject, aTopic, aData) => { + Services.obs.removeObserver(obs, aTopic); + resolve(aSubject); } Services.obs.addObserver(obs, topic, false); }); diff --git a/browser/base/content/test/general/browser_tabfocus.js b/browser/base/content/test/general/browser_tabfocus.js index c31d66538ca7..4042421e84f9 100644 --- a/browser/base/content/test/general/browser_tabfocus.js +++ b/browser/base/content/test/general/browser_tabfocus.js @@ -63,7 +63,7 @@ function* getFocusedElementForBrowser(browser, dontCheckExtraFocus = false) function focusInChild() { - var fm = Components.classes["@mozilla.org/focus-manager;1"]. + var contentFM = Components.classes["@mozilla.org/focus-manager;1"]. getService(Components.interfaces.nsIFocusManager); function getWindowDocId(target) @@ -91,24 +91,24 @@ function focusInChild() addMessageListener("Browser:GetFocusedElement", function getFocusedElement(message) { var focusedWindow = {}; - var node = fm.getFocusedElementForWindow(content, false, focusedWindow); + var node = contentFM.getFocusedElementForWindow(content, false, focusedWindow); var details = "Focus is " + (node ? node.id : ""); /* Check focus manager properties. Add an error onto the string if they are not what is expected which will cause matching to fail in the parent process. */ let doc = content.document; if (!message.data.dontCheckExtraFocus) { - if (fm.focusedElement != node) { + if (contentFM.focusedElement != node) { details += ""; } - if (fm.focusedWindow && fm.focusedWindow != content) { + if (contentFM.focusedWindow && contentFM.focusedWindow != content) { details += ""; } - if ((fm.focusedWindow == content) != doc.hasFocus()) { + if ((contentFM.focusedWindow == content) != doc.hasFocus()) { details += ""; } - if ((fm.focusedElement && doc.activeElement != fm.focusedElement) || - (!fm.focusedElement && doc.activeElement != doc.body)) { + if ((contentFM.focusedElement && doc.activeElement != contentFM.focusedElement) || + (!contentFM.focusedElement && doc.activeElement != doc.body)) { details += ""; } } @@ -160,7 +160,6 @@ add_task(function*() { window.addEventListener("blur", _browser_tabfocus_test_eventOccured, true); // make sure that the focus initially starts out blank - var fm = Services.focus; var focusedWindow = {}; let focused = yield getFocusedElementForBrowser(browser1); @@ -373,19 +372,19 @@ add_task(function*() { finish(); }); -function getWindowDocId(target) -{ - if (target == browser1.contentWindow || target == browser1.contentDocument) { - return "window1"; - } - if (target == browser2.contentWindow || target == browser2.contentDocument) { - return "window2"; - } - return "main-window"; -} - function _browser_tabfocus_test_eventOccured(event) { + function getWindowDocId(target) + { + if (target == browser1.contentWindow || target == browser1.contentDocument) { + return "window1"; + } + if (target == browser2.contentWindow || target == browser2.contentDocument) { + return "window2"; + } + return "main-window"; + } + var id; // Some focus events from the child bubble up? Ignore them. diff --git a/browser/base/content/test/general/browser_web_channel.js b/browser/base/content/test/general/browser_web_channel.js index 1b733843f38d..2e777fded20f 100644 --- a/browser/base/content/test/general/browser_web_channel.js +++ b/browser/base/content/test/general/browser_web_channel.js @@ -130,19 +130,19 @@ var gTests = [ preRedirectChannel.listen(function (id, message, preRedirectSender) { if (message.command === "redirecting") { - postRedirectChannel.listen(function (id, message, postRedirectSender) { - is(id, "post_redirect"); - isnot(message.command, "no_response_expected"); + postRedirectChannel.listen(function (aId, aMessage, aPostRedirectSender) { + is(aId, "post_redirect"); + isnot(aMessage.command, "no_response_expected"); - if (message.command === "loaded") { + if (aMessage.command === "loaded") { // The message should not be received on the preRedirectChannel // because the target window has redirected. preRedirectChannel.send({ command: "no_response_expected" }, preRedirectSender); - postRedirectChannel.send({ command: "done" }, postRedirectSender); - } else if (message.command === "done") { + postRedirectChannel.send({ command: "done" }, aPostRedirectSender); + } else if (aMessage.command === "done") { resolve(); } else { - reject(new Error(`Unexpected command ${message.command}`)); + reject(new Error(`Unexpected command ${aMessage.command}`)); } }); } else { @@ -403,9 +403,9 @@ function test() { waitForExplicitFinish(); Task.spawn(function* () { - for (let test of gTests) { - info("Running: " + test.desc); - yield test.run(); + for (let testCase of gTests) { + info("Running: " + testCase.desc); + yield testCase.run(); } }).then(finish, ex => { ok(false, "Unexpected Exception: " + ex); diff --git a/browser/base/content/test/general/content_aboutAccounts.js b/browser/base/content/test/general/content_aboutAccounts.js index 24116af5adb4..12ac04934863 100644 --- a/browser/base/content/test/general/content_aboutAccounts.js +++ b/browser/base/content/test/general/content_aboutAccounts.js @@ -30,17 +30,17 @@ addEventListener("DOMContentLoaded", function domContentLoaded(event) { } // We use DOMContentLoaded here as that fires for our iframe even when we've // arranged for the URL in the iframe to cause an error. - addEventListener("DOMContentLoaded", function iframeLoaded(event) { + addEventListener("DOMContentLoaded", function iframeLoaded(dclEvent) { if (iframe.contentWindow.location.href == "about:blank" || - event.target != iframe.contentDocument) { + dclEvent.target != iframe.contentDocument) { return; } removeEventListener("DOMContentLoaded", iframeLoaded, true); sendAsyncMessage("test:iframe:load", {url: iframe.contentDocument.location.href}); // And an event listener for the test responses, which we send to the test // via a message. - iframe.contentWindow.addEventListener("FirefoxAccountsTestResponse", function (event) { - sendAsyncMessage("test:response", {data: event.detail.data}); + iframe.contentWindow.addEventListener("FirefoxAccountsTestResponse", function (fxAccountsEvent) { + sendAsyncMessage("test:response", {data: fxAccountsEvent.detail.data}); }, true); }, true); }, true); @@ -72,9 +72,9 @@ addMessageListener("test:load-with-mocked-profile-path", function (message) { content.getDefaultProfilePath = () => message.data.profilePath; // now wait for the iframe to load. let iframe = content.document.getElementById("remote"); - iframe.addEventListener("load", function iframeLoaded(event) { + iframe.addEventListener("load", function iframeLoaded(loadEvent) { if (iframe.contentWindow.location.href == "about:blank" || - event.target != iframe) { + loadEvent.target != iframe) { return; } iframe.removeEventListener("load", iframeLoaded, true); diff --git a/browser/base/content/test/general/contextmenu_common.js b/browser/base/content/test/general/contextmenu_common.js index 76e3344a38d2..1a0fa931ae2d 100644 --- a/browser/base/content/test/general/contextmenu_common.js +++ b/browser/base/content/test/general/contextmenu_common.js @@ -258,13 +258,13 @@ function* test_contextmenu(selector, menuItems, options={}) { if (!options.skipFocusChange) { yield ContentTask.spawn(gBrowser.selectedBrowser, - {lastElementSelector, selector}, - function*({lastElementSelector, selector}) { - if (lastElementSelector) { - let lastElement = content.document.querySelector(lastElementSelector); - lastElement.blur(); + [lastElementSelector, selector], + function*([contentLastElementSelector, contentSelector]) { + if (contentLastElementSelector) { + let contentLastElement = content.document.querySelector(contentLastElementSelector); + contentLastElement.blur(); } - let element = content.document.querySelector(selector); + let element = content.document.querySelector(contentSelector); element.focus(); }); lastElementSelector = selector; @@ -278,9 +278,9 @@ function* test_contextmenu(selector, menuItems, options={}) { if (options.waitForSpellCheck) { info("Waiting for spell check"); - yield ContentTask.spawn(gBrowser.selectedBrowser, selector, function*(selector) { + yield ContentTask.spawn(gBrowser.selectedBrowser, selector, function*(contentSelector) { let {onSpellCheck} = Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm", {}); - let element = content.document.querySelector(selector); + let element = content.document.querySelector(contentSelector); yield new Promise(resolve => onSpellCheck(element, resolve)); info("Spell check running"); }); diff --git a/browser/base/content/test/general/head.js b/browser/base/content/test/general/head.js index 953c200e2bd7..d1ad2a930ba4 100644 --- a/browser/base/content/test/general/head.js +++ b/browser/base/content/test/general/head.js @@ -327,7 +327,7 @@ function waitForAsyncUpdates(aCallback, aScope, aArguments) { */ function promiseIsURIVisited(aURI, aExpectedValue) { let deferred = Promise.defer(); - PlacesUtils.asyncHistory.isURIVisited(aURI, function(aURI, aIsVisited) { + PlacesUtils.asyncHistory.isURIVisited(aURI, function(unused, aIsVisited) { deferred.resolve(aIsVisited); }); @@ -373,9 +373,9 @@ function promiseHistoryClearedState(aURIs, aShouldBeCleared) { deferred.resolve(); } aURIs.forEach(function (aURI) { - PlacesUtils.asyncHistory.isURIVisited(aURI, function(aURI, aIsVisited) { - is(aIsVisited, !aShouldBeCleared, - "history visit " + aURI.spec + " should " + niceStr + " exist"); + PlacesUtils.asyncHistory.isURIVisited(aURI, function(uri, isVisited) { + is(isVisited, !aShouldBeCleared, + "history visit " + uri.spec + " should " + niceStr + " exist"); callbackDone(); }); }); @@ -400,7 +400,7 @@ function promiseHistoryClearedState(aURIs, aShouldBeCleared) { * @return promise */ function waitForDocLoadAndStopIt(aExpectedURL, aBrowser=gBrowser.selectedBrowser, aStopFromProgressListener=true) { - function content_script(aStopFromProgressListener) { + function content_script(contentStopFromProgressListener) { let { interfaces: Ci, utils: Cu } = Components; Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); let wp = docShell.QueryInterface(Ci.nsIWebProgress); @@ -428,7 +428,7 @@ function waitForDocLoadAndStopIt(aExpectedURL, aBrowser=gBrowser.selectedBrowser let chan = req.QueryInterface(Ci.nsIChannel); dump(`waitForDocLoadAndStopIt: Document start: ${chan.URI.spec}\n`); - stopContent(aStopFromProgressListener, chan.originalURI.spec); + stopContent(contentStopFromProgressListener, chan.originalURI.spec); } }, QueryInterface: XPCOMUtils.generateQI(["nsISupportsWeakReference"]) @@ -908,8 +908,8 @@ function promiseTopicObserved(aTopic) { return new Promise((resolve) => { Services.obs.addObserver( - function PTO_observe(aSubject, aTopic, aData) { - Services.obs.removeObserver(PTO_observe, aTopic); + function PTO_observe(aSubject, aTopic2, aData) { + Services.obs.removeObserver(PTO_observe, aTopic2); resolve({subject: aSubject, data: aData}); }, aTopic, false); }); @@ -1045,7 +1045,7 @@ function promiseCrashReport(expectedExtra={}) { return Task.spawn(function*() { info("Starting wait on crash-report-status"); let [subject, ] = - yield TestUtils.topicObserved("crash-report-status", (subject, data) => { + yield TestUtils.topicObserved("crash-report-status", (unused, data) => { return data == "success"; }); info("Topic observed!"); diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html b/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html index dfa5874b6b1b..882030b67926 100644 --- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html +++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html @@ -97,10 +97,10 @@ let browser = win.gBrowser.selectedBrowser; let src = "https://example.com" + STSPATH + "/" + round + "_bootstrap.html"; - ContentTask.spawn(browser, src, function* (src) { + ContentTask.spawn(browser, src, function* (contentSrc) { let frame = content.document.createElement("iframe"); frame.setAttribute('id', 'ifr_bootstrap'); - frame.setAttribute('src', src); + frame.setAttribute('src', contentSrc); return new Promise(resolve => { frame.addEventListener("load", resolve); @@ -126,10 +126,10 @@ let src = test.url + '?id=' + testName; let browser = win.gBrowser.selectedBrowser; - ContentTask.spawn(browser, [id, src], function* ([id, src]) { + ContentTask.spawn(browser, [id, src], function* ([contentId, contentSrc]) { let frame = content.document.createElement("iframe"); - frame.setAttribute('id', id); - frame.setAttribute('src', src); + frame.setAttribute('id', contentId); + frame.setAttribute('src', contentSrc); return new Promise(resolve => { frame.addEventListener("load", () => { @@ -182,10 +182,10 @@ SimpleTest.info("DONE WITH ROUND " + currentround); // remove all the iframes in the document let browser = win.gBrowser.selectedBrowser; - ContentTask.spawn(browser, testframes, function* (testframes) { + ContentTask.spawn(browser, testframes, function* (contentTestFrames) { content.document.body.removeChild( content.document.getElementById('ifr_bootstrap')); - for (let test in testframes) { + for (let test in contentTestFrames) { content.document.body.removeChild( content.document.getElementById('ifr_' + test)); } diff --git a/testing/mochitest/mochitest.eslintrc.js b/testing/mochitest/mochitest.eslintrc.js index cdd060d6bb04..0d68bd86e89d 100644 --- a/testing/mochitest/mochitest.eslintrc.js +++ b/testing/mochitest/mochitest.eslintrc.js @@ -3,6 +3,7 @@ module.exports = { rules: { "mozilla/import-headjs-globals": 1, "mozilla/mark-test-function-used": 1, + "no-shadow": 2, }, "env": { diff --git a/toolkit/components/alerts/test/test_alerts_noobserve.html b/toolkit/components/alerts/test/test_alerts_noobserve.html index 042a6a532dce..0cc452b8af3d 100644 --- a/toolkit/components/alerts/test/test_alerts_noobserve.html +++ b/toolkit/components/alerts/test/test_alerts_noobserve.html @@ -23,7 +23,7 @@ const Cc = SpecialPowers.Cc; const Ci = SpecialPowers.Ci; const chromeScript = SpecialPowers.loadChromeScript(_ => { - const { classes: Cc, interfaces: Ci, utils: Cu } = Components; + const { utils: Cu } = Components; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Timer.jsm"); diff --git a/toolkit/components/alerts/test/test_alerts_requireinteraction.html b/toolkit/components/alerts/test/test_alerts_requireinteraction.html index 35569612e4c4..a5e3a4004f1f 100644 --- a/toolkit/components/alerts/test/test_alerts_requireinteraction.html +++ b/toolkit/components/alerts/test/test_alerts_requireinteraction.html @@ -14,7 +14,7 @@ const Cc = SpecialPowers.Cc; const Ci = SpecialPowers.Ci; const chromeScript = SpecialPowers.loadChromeScript(_ => { - const { classes: Cc, interfaces: Ci, utils: Cu } = Components; + const { utils: Cu } = Components; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Timer.jsm"); @@ -30,7 +30,7 @@ const chromeScript = SpecialPowers.loadChromeScript(_ => { return; } - var win = aSubject.QueryInterface(Ci.nsIDOMWindow); + var win = aSubject.QueryInterface(Components.interfaces.nsIDOMWindow); win.addEventListener("load", function onLoad() { win.removeEventListener("load", onLoad); let windowType = win.document.documentElement.getAttribute("windowtype"); diff --git a/toolkit/components/alerts/test/test_image.html b/toolkit/components/alerts/test/test_image.html index 00b7731fe643..8998398ab6a0 100644 --- a/toolkit/components/alerts/test/test_image.html +++ b/toolkit/components/alerts/test/test_image.html @@ -35,11 +35,11 @@ function promiseImage(alert, timeout = 0, userData = null) { resolve(value); } alert.loadImage(timeout, SpecialPowers.wrapCallbackObject({ - onImageReady(userData, request) { - done([true, request, userData]); + onImageReady(aUserData, aRequest) { + done([true, aRequest, aUserData]); }, - onImageMissing(userData) { - done([false, userData]); + onImageMissing(aUserData) { + done([false, aUserData]); }, }), SpecialPowers.wrap(userData)); }); @@ -85,10 +85,10 @@ add_task(function* testCancel() { var alert = makeAlert(null, imageServerURL + "?f=image.gif&t=180"); yield new Promise((resolve, reject) => { var request = alert.loadImage(0, SpecialPowers.wrapCallbackObject({ - onImageReady(userData, request) { + onImageReady() { reject(new Error("Should not load cancelled request")); }, - onImageMissing(userData) { + onImageMissing() { resolve(); }, }), null); diff --git a/toolkit/components/alerts/test/test_multiple_alerts.html b/toolkit/components/alerts/test/test_multiple_alerts.html index 2c715af61fb5..9d939b63a005 100644 --- a/toolkit/components/alerts/test/test_multiple_alerts.html +++ b/toolkit/components/alerts/test/test_multiple_alerts.html @@ -14,13 +14,11 @@ const Cc = SpecialPowers.Cc; const Ci = SpecialPowers.Ci; const chromeScript = SpecialPowers.loadChromeScript(_ => { - const { classes: Cc, interfaces: Ci, utils: Cu } = Components; + Components.utils.import("resource://gre/modules/Services.jsm"); + Components.utils.import("resource://gre/modules/Timer.jsm"); - Cu.import("resource://gre/modules/Services.jsm"); - Cu.import("resource://gre/modules/Timer.jsm"); - - const alertService = Cc["@mozilla.org/alerts-service;1"] - .getService(Ci.nsIAlertsService); + const alertService = Components.classes["@mozilla.org/alerts-service;1"] + .getService(Components.interfaces.nsIAlertsService); addMessageListener("waitForPosition", function() { var timer = setTimeout(function() { @@ -38,7 +36,7 @@ const chromeScript = SpecialPowers.loadChromeScript(_ => { Services.ww.unregisterNotification(windowObserver); - var win = aSubject.QueryInterface(Ci.nsIDOMWindow); + var win = aSubject.QueryInterface(Components.interfaces.nsIDOMWindow); win.addEventListener("pageshow", function onPageShow() { win.removeEventListener("pageshow", onPageShow, false); diff --git a/toolkit/components/alerts/test/test_principal.html b/toolkit/components/alerts/test/test_principal.html index 99a69c69e22a..74a20dbd70db 100644 --- a/toolkit/components/alerts/test/test_principal.html +++ b/toolkit/components/alerts/test/test_principal.html @@ -21,9 +21,7 @@ const notifier = Cc["@mozilla.org/alerts-service;1"] .getService(Ci.nsIAlertsService); const chromeScript = SpecialPowers.loadChromeScript(_ => { - const { classes: Cc, interfaces: Ci, utils: Cu } = Components; - - Cu.import("resource://gre/modules/Services.jsm"); + Components.utils.import("resource://gre/modules/Services.jsm"); addMessageListener("anyXULAlertsVisible", function() { var windows = Services.wm.getEnumerator("alert:alert"); diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_background_debug_global.html b/toolkit/components/extensions/test/mochitest/test_chrome_ext_background_debug_global.html index 0edf5ea86a93..1cc9f8710f62 100644 --- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_background_debug_global.html +++ b/toolkit/components/extensions/test/mochitest/test_chrome_ext_background_debug_global.html @@ -64,7 +64,7 @@ add_task(function* () { }); let addon = yield new Promise((resolve, reject) => { - AddonManager.getAddonByID(ID, addon => addon ? resolve(addon) : reject()); + AddonManager.getAddonByID(ID, aAddon => aAddon ? resolve(aAddon) : reject()); }); ok(addon, `Got the addon wrapper for ${addon.id}`); diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_saveAs.html b/toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_saveAs.html index 9d8c6e067217..5d6ce850b3a4 100644 --- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_saveAs.html +++ b/toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_saveAs.html @@ -13,9 +13,8 @@ "use strict"; add_task(function* test_downloads_saveAs() { - function background() { - const url = URL.createObjectURL(new Blob(['file content'])); + const url = URL.createObjectURL(new Blob(["file content"])); browser.test.onMessage.addListener(() => browser.downloads.download({url, saveAs: true}) .then(id => browser.downloads.onChanged.addListener(delta => { diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_storage_cleanup.html b/toolkit/components/extensions/test/mochitest/test_chrome_ext_storage_cleanup.html index e05125b70e61..010769500ad2 100644 --- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_storage_cleanup.html +++ b/toolkit/components/extensions/test/mochitest/test_chrome_ext_storage_cleanup.html @@ -36,10 +36,10 @@ add_task(function* test_uninstall() { let transaction = db.transaction("store", "readwrite"); let addreq = transaction.objectStore("store") .add({name: "hello", value: "world"}); - addreq.onerror = e => { - reject(new Error(`add to indexedDB failed with ${e.errorCode}`)); + addreq.onerror = addreqError => { + reject(new Error(`add to indexedDB failed with ${addreqError.errorCode}`)); }; - addreq.onsuccess = e => { + addreq.onsuccess = () => { resolve(); }; }; @@ -70,10 +70,10 @@ add_task(function* test_uninstall() { let db = e.target.result; let transaction = db.transaction("store", "readwrite"); let addreq = transaction.objectStore("store").get("hello"); - addreq.onerror = e => { - reject(new Error(`read from indexedDB failed with ${e.errorCode}`)); + addreq.onerror = addreqError => { + reject(new Error(`read from indexedDB failed with ${addreqError.errorCode}`)); }; - addreq.onsuccess = e => { + addreq.onsuccess = () => { let match = (addreq.result.value == "world"); resolve(match); }; diff --git a/toolkit/components/extensions/test/mochitest/test_ext_content_security_policy.html b/toolkit/components/extensions/test/mochitest/test_ext_content_security_policy.html index 703e85b8d9ee..a36f29563122 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_content_security_policy.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_content_security_policy.html @@ -79,14 +79,14 @@ function* testPolicy(customCSP = null) { return JSON.parse(cspJSON); } - function background(getCSP) { + function background(getCSPFn) { browser.test.sendMessage("base-url", browser.extension.getURL("").replace(/\/$/, "")); - browser.test.sendMessage("background-csp", getCSP(window)); + browser.test.sendMessage("background-csp", getCSPFn(window)); } - function tabScript(getCSP) { - browser.test.sendMessage("tab-csp", getCSP(window)); + function tabScript(getCSPFn) { + browser.test.sendMessage("tab-csp", getCSPFn(window)); } let extension = ExtensionTestUtils.loadExtension({ diff --git a/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions.html b/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions.html index b6f48667c786..52ad48285f42 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions.html @@ -19,7 +19,7 @@ function* testCookies(options) { // pass an expiration date to the background script. options.expiry = Date.now() / 1000 + 3600; - function background(options) { + function background(backgroundOptions) { // Ask the parent scope to change some cookies we may or may not have // permission for. let awaitChanges = new Promise(resolve => { @@ -37,7 +37,7 @@ function* testCookies(options) { // Try to access some cookies in various ways. - let {url, domain, secure} = options; + let {url, domain, secure} = backgroundOptions; let failures = 0; let tallyFailure = error => { @@ -47,23 +47,23 @@ function* testCookies(options) { awaitChanges.then(() => { return browser.cookies.get({url, name: "foo"}); }).then(cookie => { - browser.test.assertEq(options.shouldPass, cookie != null, "should pass == get cookie"); + browser.test.assertEq(backgroundOptions.shouldPass, cookie != null, "should pass == get cookie"); return browser.cookies.getAll({domain}); }).then(cookies => { - if (options.shouldPass) { + if (backgroundOptions.shouldPass) { browser.test.assertEq(2, cookies.length, "expected number of cookies"); } else { browser.test.assertEq(0, cookies.length, "expected number of cookies"); } return Promise.all([ - browser.cookies.set({url, domain, secure, name: "foo", "value": "baz", expirationDate: options.expiry}).catch(tallyFailure), - browser.cookies.set({url, domain, secure, name: "bar", "value": "quux", expirationDate: options.expiry}).catch(tallyFailure), + browser.cookies.set({url, domain, secure, name: "foo", "value": "baz", expirationDate: backgroundOptions.expiry}).catch(tallyFailure), + browser.cookies.set({url, domain, secure, name: "bar", "value": "quux", expirationDate: backgroundOptions.expiry}).catch(tallyFailure), browser.cookies.remove({url, name: "deleted"}), ]); }).then(() => { - if (options.shouldPass) { + if (backgroundOptions.shouldPass) { // The order of eviction events isn't guaranteed, so just check that // it's there somewhere. let evicted = changed.indexOf("evicted:evicted"); @@ -82,7 +82,7 @@ function* testCookies(options) { browser.test.notifyPass("cookie-permissions"); }).then(() => { - if (!(options.shouldPass || options.shouldWrite)) { + if (!(backgroundOptions.shouldPass || backgroundOptions.shouldWrite)) { browser.test.assertEq(2, failures, "Expected failures"); } else { browser.test.assertEq(0, failures, "Expected no failures"); diff --git a/toolkit/components/extensions/test/mochitest/test_ext_i18n.html b/toolkit/components/extensions/test/mochitest/test_ext_i18n.html index be8250d0fb7e..cc244ca2ca91 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_i18n.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_i18n.html @@ -130,8 +130,8 @@ add_task(function* test_i18n() { }, }, - "content.js": "new " + function(runTests) { - runTests((...args) => { + "content.js": "new " + function(runTestsFn) { + runTestsFn((...args) => { browser.runtime.sendMessage(["assertEq", ...args]); }); @@ -139,7 +139,7 @@ add_task(function* test_i18n() { } + `(${runTests})`, }, - background: "new " + function(runTests) { + background: "new " + function(runTestsFn) { browser.runtime.onMessage.addListener(([msg, ...args]) => { if (msg == "assertEq") { browser.test.assertEq(...args); @@ -148,7 +148,7 @@ add_task(function* test_i18n() { } }); - runTests(browser.test.assertEq.bind(browser.test)); + runTestsFn(browser.test.assertEq.bind(browser.test)); } + `(${runTests})`, }); @@ -248,7 +248,7 @@ add_task(function* test_get_ui_language() { }; } - function background(getResults) { + function background(getResultsFn) { function checkResults(source, results, expected) { browser.test.assertEq( expected, @@ -267,7 +267,7 @@ add_task(function* test_get_ui_language() { browser.test.onMessage.addListener(([msg, expected]) => { browser.tabs.sendMessage(tabId, "get-results", result => { checkResults("contentScript", result, expected); - checkResults("background", getResults(), expected); + checkResults("background", getResultsFn(), expected); browser.test.sendMessage("done"); }); @@ -279,9 +279,9 @@ add_task(function* test_get_ui_language() { }); } - function content(getResults) { + function content(getResultsFn) { browser.runtime.onMessage.addListener((msg, sender, respond) => { - respond(getResults()); + respond(getResultsFn()); }); } diff --git a/toolkit/components/extensions/test/mochitest/test_ext_i18n_css.html b/toolkit/components/extensions/test/mochitest/test_ext_i18n_css.html index ab1eeaafa506..7c6a8eeaaa72 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_i18n_css.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_i18n_css.html @@ -16,7 +16,7 @@ add_task(function* test_i18n_css() { let extension = ExtensionTestUtils.loadExtension({ background: function() { - function fetch(url) { + function backgroundFetch(url) { return new Promise((resolve, reject) => { let xhr = new XMLHttpRequest(); xhr.open("GET", url); @@ -26,7 +26,7 @@ add_task(function* test_i18n_css() { }); } - Promise.all([fetch("foo.css"), fetch("bar.CsS?x#y"), fetch("foo.txt")]).then(results => { + Promise.all([backgroundFetch("foo.css"), backgroundFetch("bar.CsS?x#y"), backgroundFetch("foo.txt")]).then(results => { browser.test.assertEq("body { max-width: 42px; }", results[0], "CSS file localized"); browser.test.assertEq("body { max-width: 42px; }", results[1], "CSS file localized"); diff --git a/toolkit/components/extensions/test/mochitest/test_ext_permission_xhr.html b/toolkit/components/extensions/test/mochitest/test_ext_permission_xhr.html index c6a8ebb453f7..f9b99773a5a9 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_permission_xhr.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_permission_xhr.html @@ -61,8 +61,8 @@ add_task(function* test_simple() { }); } - function background(runTests) { - runTests("bg").then(() => { + function background(runTestsFn) { + runTestsFn("bg").then(() => { browser.test.notifyPass("permission_xhr"); }); } @@ -77,8 +77,8 @@ add_task(function* test_simple() { }], }, files: { - "content.js": "new " + function(runTests) { - runTests("content").then(() => { + "content.js": "new " + function(runTestsFn) { + runTestsFn("content").then(() => { window.wrappedJSObject.privilegedFetch = fetch; window.wrappedJSObject.privilegedXHR = XMLHttpRequest; diff --git a/toolkit/components/extensions/test/mochitest/test_ext_storage_content.html b/toolkit/components/extensions/test/mochitest/test_ext_storage_content.html index 986828a2b230..136a93a93964 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_storage_content.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_storage_content.html @@ -35,9 +35,9 @@ function contentScript() { let globalChanges = {}; - browser.storage.onChanged.addListener((changes, storage) => { - browser.test.assertEq("local", storage, "storage is local"); - Object.assign(globalChanges, changes); + browser.storage.onChanged.addListener((aChanges, aStorage) => { + browser.test.assertEq("local", aStorage, "storage is local"); + Object.assign(globalChanges, aChanges); }); function checkChanges(changes) { diff --git a/toolkit/components/extensions/test/mochitest/test_ext_storage_tab.html b/toolkit/components/extensions/test/mochitest/test_ext_storage_tab.html index f8af56072306..a3020ca7825f 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_storage_tab.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_storage_tab.html @@ -40,8 +40,8 @@ add_task(function* test_multiple_pages() { let storage = browser.storage.local; browser.test.log("create"); - browser.tabs.create({url: "tab.html"}).then(tab => { - tabId = tab.id; + browser.tabs.create({url: "tab.html"}).then(tabObj => { + tabId = tabObj.id; return tabReady; }).then(() => { diff --git a/toolkit/components/extensions/test/mochitest/test_ext_web_accessible_resources.html b/toolkit/components/extensions/test/mochitest/test_ext_web_accessible_resources.html index d299c3df1924..b0aa47b7ead9 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_web_accessible_resources.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_web_accessible_resources.html @@ -209,9 +209,9 @@ add_task(function* test_web_accessible_resources_csp() { testImageLoading(browser.extension.getURL("image.png"), "loaded"); - let testScript = document.createElement("script"); - testScript.setAttribute("src", browser.extension.getURL("test_script.js")); - document.head.appendChild(testScript); + let testScriptElement = document.createElement("script"); + testScriptElement.setAttribute("src", browser.extension.getURL("test_script.js")); + document.head.appendChild(testScriptElement); browser.runtime.sendMessage("script-loaded"); } @@ -301,9 +301,9 @@ add_task(function* test_web_accessible_resources_mixed_content() { testImageLoading("http://example.com/tests/toolkit/components/extensions/test/mochitest/file_image_bad.png", "blocked"); testImageLoading(browser.extension.getURL("image.png"), "loaded"); - let testScript = document.createElement("script"); - testScript.setAttribute("src", browser.extension.getURL("test_script.js")); - document.head.appendChild(testScript); + let testScriptElement = document.createElement("script"); + testScriptElement.setAttribute("src", browser.extension.getURL("test_script.js")); + document.head.appendChild(testScriptElement); window.addEventListener("message", event => { browser.runtime.sendMessage(event.data); diff --git a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_upload.html b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_upload.html index 05520b1d9bfc..669f1cb6819a 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_upload.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_upload.html @@ -46,8 +46,8 @@ let files, testFile, blob, file, uploads; add_task(function* test_setup() { files = yield new Promise(resolve => { - SpecialPowers.createFiles([{name: "testFile.pdf", data: "Not really a PDF file :)", "type": "application/x-pdf"}], (files) => { - resolve(files); + SpecialPowers.createFiles([{name: "testFile.pdf", data: "Not really a PDF file :)", "type": "application/x-pdf"}], (result) => { + resolve(result); }); }); testFile = files[0]; diff --git a/toolkit/components/passwordmgr/test/browser/browser_DOMFormHasPassword.js b/toolkit/components/passwordmgr/test/browser/browser_DOMFormHasPassword.js index fbaf064bef64..80a0dd903e23 100644 --- a/toolkit/components/passwordmgr/test/browser/browser_DOMFormHasPassword.js +++ b/toolkit/components/passwordmgr/test/browser/browser_DOMFormHasPassword.js @@ -5,7 +5,7 @@ const ids = { CHANGE_INPUT_ID: "input2", }; -function task(ids) { +function task(contentIds) { let resolve; let promise = new Promise(r => { resolve = r; }); @@ -31,40 +31,40 @@ function task(ids) { addEventListener("DOMFormHasPassword", test_inputAddHandler, false); let input = gDoc.createElementNS("http://www.w3.org/1999/xhtml", "input"); input.setAttribute("type", "password"); - input.setAttribute("id", ids.INPUT_ID); + input.setAttribute("id", contentIds.INPUT_ID); input.setAttribute("data-test", "unique-attribute"); - gDoc.getElementById(ids.FORM1_ID).appendChild(input); + gDoc.getElementById(contentIds.FORM1_ID).appendChild(input); } function test_inputAddHandler(evt) { removeEventListener(evt.type, test_inputAddHandler, false); - is(evt.target.id, ids.FORM1_ID, + is(evt.target.id, contentIds.FORM1_ID, evt.type + " event targets correct form element (added password element)"); gDoc.defaultView.setTimeout(test_inputChangeForm, 0); } function test_inputChangeForm() { addEventListener("DOMFormHasPassword", test_inputChangeFormHandler, false); - let input = gDoc.getElementById(ids.INPUT_ID); - input.setAttribute("form", ids.FORM2_ID); + let input = gDoc.getElementById(contentIds.INPUT_ID); + input.setAttribute("form", contentIds.FORM2_ID); } function test_inputChangeFormHandler(evt) { removeEventListener(evt.type, test_inputChangeFormHandler, false); - is(evt.target.id, ids.FORM2_ID, + is(evt.target.id, contentIds.FORM2_ID, evt.type + " event targets correct form element (changed form)"); gDoc.defaultView.setTimeout(test_inputChangesType, 0); } function test_inputChangesType() { addEventListener("DOMFormHasPassword", test_inputChangesTypeHandler, false); - let input = gDoc.getElementById(ids.CHANGE_INPUT_ID); + let input = gDoc.getElementById(contentIds.CHANGE_INPUT_ID); input.setAttribute("type", "password"); } function test_inputChangesTypeHandler(evt) { removeEventListener(evt.type, test_inputChangesTypeHandler, false); - is(evt.target.id, ids.FORM1_ID, + is(evt.target.id, contentIds.FORM1_ID, evt.type + " event targets correct form element (changed type)"); gDoc.defaultView.setTimeout(finish, 0); } diff --git a/toolkit/components/passwordmgr/test/browser/browser_DOMInputPasswordAdded.js b/toolkit/components/passwordmgr/test/browser/browser_DOMInputPasswordAdded.js index f8c2adb6f5ed..f54892e190fe 100644 --- a/toolkit/components/passwordmgr/test/browser/browser_DOMInputPasswordAdded.js +++ b/toolkit/components/passwordmgr/test/browser/browser_DOMInputPasswordAdded.js @@ -8,7 +8,7 @@ const consts = { BODY_INPUT_ID: "input3", }; -function task(consts) { +function task(contentConsts) { let resolve; let promise = new Promise(r => { resolve = r; }); @@ -30,26 +30,26 @@ function task(consts) { function test_inputAdd() { addEventListener("DOMInputPasswordAdded", test_inputAddHandler, false); - let input = gDoc.createElementNS(consts.HTML_NS, "input"); + let input = gDoc.createElementNS(contentConsts.HTML_NS, "input"); input.setAttribute("type", "password"); - input.setAttribute("id", consts.INPUT_ID); + input.setAttribute("id", contentConsts.INPUT_ID); input.setAttribute("data-test", "unique-attribute"); - gDoc.getElementById(consts.FORM1_ID).appendChild(input); + gDoc.getElementById(contentConsts.FORM1_ID).appendChild(input); info("Done appending the input element"); } function test_inputAddHandler(evt) { removeEventListener(evt.type, test_inputAddHandler, false); - Assert.equal(evt.target.id, consts.INPUT_ID, + Assert.equal(evt.target.id, contentConsts.INPUT_ID, evt.type + " event targets correct input element (added password element)"); gDoc.defaultView.setTimeout(test_inputAddOutsideForm, 0); } function test_inputAddOutsideForm() { addEventListener("DOMInputPasswordAdded", test_inputAddOutsideFormHandler, false); - let input = gDoc.createElementNS(consts.HTML_NS, "input"); + let input = gDoc.createElementNS(contentConsts.HTML_NS, "input"); input.setAttribute("type", "password"); - input.setAttribute("id", consts.BODY_INPUT_ID); + input.setAttribute("id", contentConsts.BODY_INPUT_ID); input.setAttribute("data-test", "unique-attribute"); gDoc.body.appendChild(input); info("Done appending the input element to the body"); @@ -57,20 +57,20 @@ function task(consts) { function test_inputAddOutsideFormHandler(evt) { removeEventListener(evt.type, test_inputAddOutsideFormHandler, false); - Assert.equal(evt.target.id, consts.BODY_INPUT_ID, + Assert.equal(evt.target.id, contentConsts.BODY_INPUT_ID, evt.type + " event targets correct input element (added password element outside form)"); gDoc.defaultView.setTimeout(test_inputChangesType, 0); } function test_inputChangesType() { addEventListener("DOMInputPasswordAdded", test_inputChangesTypeHandler, false); - let input = gDoc.getElementById(consts.CHANGE_INPUT_ID); + let input = gDoc.getElementById(contentConsts.CHANGE_INPUT_ID); input.setAttribute("type", "password"); } function test_inputChangesTypeHandler(evt) { removeEventListener(evt.type, test_inputChangesTypeHandler, false); - Assert.equal(evt.target.id, consts.CHANGE_INPUT_ID, + Assert.equal(evt.target.id, contentConsts.CHANGE_INPUT_ID, evt.type + " event targets correct input element (changed type)"); gDoc.defaultView.setTimeout(completeTest, 0); } diff --git a/toolkit/components/passwordmgr/test/browser/browser_http_autofill.js b/toolkit/components/passwordmgr/test/browser/browser_http_autofill.js index 86d1560d4eb5..beb928a34e3b 100644 --- a/toolkit/components/passwordmgr/test/browser/browser_http_autofill.js +++ b/toolkit/components/passwordmgr/test/browser/browser_http_autofill.js @@ -23,11 +23,11 @@ add_task(function* test_http_autofill() { let tab = yield BrowserTestUtils .openNewForegroundTab(gBrowser, `${scheme}${TEST_URL_PATH}form_basic.html`); - let {username, password} = yield ContentTask.spawn(gBrowser.selectedBrowser, null, function* () { + let [username, password] = yield ContentTask.spawn(gBrowser.selectedBrowser, null, function* () { let doc = content.document; - let username = doc.getElementById("form-basic-username").value; - let password = doc.getElementById("form-basic-password").value; - return { username, password }; + let contentUsername = doc.getElementById("form-basic-username").value; + let contentPassword = doc.getElementById("form-basic-password").value; + return [contentUsername, contentPassword]; }); is(username, scheme == "http" ? "" : "username", "Username filled correctly"); @@ -42,12 +42,12 @@ add_task(function* test_iframe_in_http_autofill() { let tab = yield BrowserTestUtils .openNewForegroundTab(gBrowser, `${scheme}${TEST_URL_PATH}form_basic_iframe.html`); - let {username, password} = yield ContentTask.spawn(gBrowser.selectedBrowser, null, function* () { + let [username, password] = yield ContentTask.spawn(gBrowser.selectedBrowser, null, function* () { let doc = content.document; let iframe = doc.getElementById("test-iframe"); - let username = iframe.contentWindow.document.getElementById("form-basic-username").value; - let password = iframe.contentWindow.document.getElementById("form-basic-password").value; - return { username, password }; + let contentUsername = iframe.contentWindow.document.getElementById("form-basic-username").value; + let contentPassword = iframe.contentWindow.document.getElementById("form-basic-password").value; + return [contentUsername, contentPassword]; }); is(username, scheme == "http" ? "" : "username", "Username filled correctly"); @@ -62,11 +62,11 @@ add_task(function* test_http_action_autofill() { let tab = yield BrowserTestUtils .openNewForegroundTab(gBrowser, `https${TEST_URL_PATH}form_cross_origin_${type}_action.html`); - let {username, password} = yield ContentTask.spawn(gBrowser.selectedBrowser, null, function* () { + let [username, password] = yield ContentTask.spawn(gBrowser.selectedBrowser, null, function* () { let doc = content.document; - let username = doc.getElementById("form-basic-username").value; - let password = doc.getElementById("form-basic-password").value; - return { username, password }; + let contentUsername = doc.getElementById("form-basic-username").value; + let contentPassword = doc.getElementById("form-basic-password").value; + return [contentUsername, contentPassword]; }); is(username, type == "insecure" ? "" : "username", "Username filled correctly"); diff --git a/toolkit/components/passwordmgr/test/browser/browser_insecurePasswordWarning.js b/toolkit/components/passwordmgr/test/browser/browser_insecurePasswordWarning.js index 6c6a31a80f55..50fa3447c760 100644 --- a/toolkit/components/passwordmgr/test/browser/browser_insecurePasswordWarning.js +++ b/toolkit/components/passwordmgr/test/browser/browser_insecurePasswordWarning.js @@ -13,21 +13,21 @@ const WARNING_PATTERN = [{ add_task(function* testInsecurePasswordWarning() { let warningPatternHandler; - function messageHandler(msg) { + function messageHandler(msgObj) { function findWarningPattern(msg) { return WARNING_PATTERN.find(patternPair => { return msg.indexOf(patternPair.msg) !== -1; }); } - let warning = findWarningPattern(msg.message); + let warning = findWarningPattern(msgObj.message); // Only handle the insecure password related warning messages. if (warning) { // Prevent any unexpected or redundant matched warning message coming after // the test case is ended. ok(warningPatternHandler, "Invoke a valid warning message handler"); - warningPatternHandler(warning, msg.message); + warningPatternHandler(warning, msgObj.message); } } Services.console.registerListener(messageHandler); diff --git a/toolkit/components/passwordmgr/test/browser/browser_notifications.js b/toolkit/components/passwordmgr/test/browser/browser_notifications.js index bab651662638..4fb012f149ec 100644 --- a/toolkit/components/passwordmgr/test/browser/browser_notifications.js +++ b/toolkit/components/passwordmgr/test/browser/browser_notifications.js @@ -40,11 +40,11 @@ add_task(function* test_save_change() { let promiseShown = BrowserTestUtils.waitForEvent(PopupNotifications.panel, "popupshown", (event) => event.target == PopupNotifications.panel); - yield ContentTask.spawn(browser, { username, password }, - function* ({ username, password }) { + yield ContentTask.spawn(browser, [username, password], + function* ([contentUsername, contentPassword]) { let doc = content.document; - doc.getElementById("form-basic-username").value = username; - doc.getElementById("form-basic-password").value = password; + doc.getElementById("form-basic-username").value = contentUsername; + doc.getElementById("form-basic-password").value = contentPassword; doc.getElementById("form-basic").submit(); }); yield promiseShown; diff --git a/toolkit/components/passwordmgr/test/browser/browser_notifications_password.js b/toolkit/components/passwordmgr/test/browser/browser_notifications_password.js index 411b4eca9c3a..8ac49dac55f0 100644 --- a/toolkit/components/passwordmgr/test/browser/browser_notifications_password.js +++ b/toolkit/components/passwordmgr/test/browser/browser_notifications_password.js @@ -81,10 +81,10 @@ add_task(function* test_edit_password() { "popupshown", (event) => event.target == PopupNotifications.panel); yield ContentTask.spawn(browser, testCase, - function* (testCase) { + function* (contentTestCase) { let doc = content.document; - doc.getElementById("form-basic-username").value = testCase.usernameInPage; - doc.getElementById("form-basic-password").value = testCase.passwordInPage; + doc.getElementById("form-basic-username").value = contentTestCase.usernameInPage; + doc.getElementById("form-basic-password").value = contentTestCase.passwordInPage; doc.getElementById("form-basic").submit(); }); yield promiseShown; diff --git a/toolkit/components/passwordmgr/test/browser/browser_passwordmgr_sort.js b/toolkit/components/passwordmgr/test/browser/browser_passwordmgr_sort.js index 0733ee585519..83272a9c41a2 100644 --- a/toolkit/components/passwordmgr/test/browser/browser_passwordmgr_sort.js +++ b/toolkit/components/passwordmgr/test/browser/browser_passwordmgr_sort.js @@ -78,10 +78,10 @@ function test() { if (aTopic == "domwindowclosed") Services.ww.unregisterNotification(arguments.callee); else if (aTopic == "domwindowopened") { - let win = aSubject.QueryInterface(Ci.nsIDOMEventTarget); + let targetWin = aSubject.QueryInterface(Ci.nsIDOMEventTarget); SimpleTest.waitForFocus(function() { - EventUtils.sendKey("RETURN", win); - }, win); + EventUtils.sendKey("RETURN", targetWin); + }, targetWin); } }); } diff --git a/toolkit/components/passwordmgr/test/browser/browser_passwordmgrdlg.js b/toolkit/components/passwordmgr/test/browser/browser_passwordmgrdlg.js index f8dcea16f18a..57cfa9f83cb7 100644 --- a/toolkit/components/passwordmgr/test/browser/browser_passwordmgrdlg.js +++ b/toolkit/components/passwordmgr/test/browser/browser_passwordmgrdlg.js @@ -89,10 +89,10 @@ function test() { if (aTopic == "domwindowclosed") Services.ww.unregisterNotification(arguments.callee); else if (aTopic == "domwindowopened") { - let win = aSubject.QueryInterface(Ci.nsIDOMEventTarget); + let targetWin = aSubject.QueryInterface(Ci.nsIDOMEventTarget); SimpleTest.waitForFocus(function() { - EventUtils.sendKey("RETURN", win); - }, win); + EventUtils.sendKey("RETURN", targetWin); + }, targetWin); } }); } @@ -115,24 +115,24 @@ function test() { filter.doCommand(); } - function runOneTest(test) { + function runOneTest(testCase) { function tester() { - is(view.rowCount, expected, expected + " logins should match '" + test.filter + "'"); + is(view.rowCount, expected, expected + " logins should match '" + testCase.filter + "'"); } let expected; switch (mode) { case 1: // without showing passwords - expected = test.count; + expected = testCase.count; break; case 2: // showing passwords - expected = ("count2" in test) ? test.count2 : test.count; + expected = ("count2" in testCase) ? testCase.count2 : testCase.count; break; case 3: // toggle - expected = test.count; + expected = testCase.count; tester(); toggleShowPasswords(function () { - expected = ("count2" in test) ? test.count2 : test.count; + expected = ("count2" in testCase) ? testCase.count2 : testCase.count; tester(); toggleShowPasswords(proceed); }); @@ -151,9 +151,9 @@ function test() { } function runNextTest() { - let test = tests[testCounter++]; - setFilter(test.filter); - setTimeout(runOneTest, 0, test); + let testCase = tests[testCounter++]; + setFilter(testCase.filter); + setTimeout(runOneTest, 0, testCase); } runNextTest(); diff --git a/toolkit/components/passwordmgr/test/browser/head.js b/toolkit/components/passwordmgr/test/browser/head.js index 786e7697b619..926cb66168d5 100644 --- a/toolkit/components/passwordmgr/test/browser/head.js +++ b/toolkit/components/passwordmgr/test/browser/head.js @@ -11,7 +11,7 @@ registerCleanupFunction(function* cleanup_removeAllLoginsAndResetRecipes() { // No need to reset the recipes if the recipe module wasn't even loaded. return; } - yield recipeParent.then(recipeParent => recipeParent.reset()); + yield recipeParent.then(recipeParentResult => recipeParentResult.reset()); }); /** diff --git a/toolkit/components/passwordmgr/test/chrome/test_privbrowsing_perwindowpb.html b/toolkit/components/passwordmgr/test/chrome/test_privbrowsing_perwindowpb.html index 3c44955802a5..6b7d4abb3a18 100644 --- a/toolkit/components/passwordmgr/test/chrome/test_privbrowsing_perwindowpb.html +++ b/toolkit/components/passwordmgr/test/chrome/test_privbrowsing_perwindowpb.html @@ -204,9 +204,9 @@ var contentPage = "http://mochi.test:8888/chrome/toolkit/components/passwordmgr/ var testWindows = []; function whenDelayedStartupFinished(aWindow, aCallback) { - Services.obs.addObserver(function observer(aSubject, aTopic) { + Services.obs.addObserver(function obs(aSubject, aTopic) { if (aWindow == aSubject) { - Services.obs.removeObserver(observer, aTopic); + Services.obs.removeObserver(obs, aTopic); setTimeout(aCallback, 0); } }, "browser-delayed-startup-finished", false); diff --git a/toolkit/components/passwordmgr/test/mochitest/test_bug_627616.html b/toolkit/components/passwordmgr/test/mochitest/test_bug_627616.html index 06f133361e6a..ad4a41cdb25c 100644 --- a/toolkit/components/passwordmgr/test/mochitest/test_bug_627616.html +++ b/toolkit/components/passwordmgr/test/mochitest/test_bug_627616.html @@ -64,7 +64,7 @@ gCurrentTest.call(this); } else { mm.sendAsyncMessage("cleanup"); - mm.addMessageListener("cleanupDone", msg => { + mm.addMessageListener("cleanupDone", () => { // mm.destroy() is called as a cleanup function by runInParent(), no // need to do it here. SimpleTest.finish(); @@ -78,43 +78,43 @@ {expectedDialogs: 0, test: testAnonymousNoAuth}]; let mm = runInParent(() => { - const { classes: Cc, interfaces: Ci, utils: Cu } = Components; + const { classes: parentCc, interfaces: parentCi, utils: parentCu } = Components; - Cu.import("resource://gre/modules/Services.jsm"); - Cu.import("resource://gre/modules/NetUtil.jsm"); - Cu.import("resource://gre/modules/Timer.jsm"); - Cu.import("resource://gre/modules/XPCOMUtils.jsm"); + parentCu.import("resource://gre/modules/Services.jsm"); + parentCu.import("resource://gre/modules/NetUtil.jsm"); + parentCu.import("resource://gre/modules/Timer.jsm"); + parentCu.import("resource://gre/modules/XPCOMUtils.jsm"); let channel = NetUtil.newChannel({ uri: "http://example.com", loadUsingSystemPrincipal: true }); - let pps = Cc["@mozilla.org/network/protocol-proxy-service;1"]. - getService(Ci.nsIProtocolProxyService); + let pps = parentCc["@mozilla.org/network/protocol-proxy-service;1"]. + getService(parentCi.nsIProtocolProxyService); pps.asyncResolve(channel, 0, { onProxyAvailable(req, uri, pi, status) { let mozproxy = "moz-proxy://" + pi.host + ":" + pi.port; - let login = Cc["@mozilla.org/login-manager/loginInfo;1"]. - createInstance(Ci.nsILoginInfo); + let login = parentCc["@mozilla.org/login-manager/loginInfo;1"]. + createInstance(parentCi.nsILoginInfo); login.init(mozproxy, null, "proxy_realm", "proxy_user", "proxy_pass", "", ""); Services.logins.addLogin(login); - let login2 = Cc["@mozilla.org/login-manager/loginInfo;1"]. - createInstance(Ci.nsILoginInfo); + let login2 = parentCc["@mozilla.org/login-manager/loginInfo;1"]. + createInstance(parentCi.nsILoginInfo); login2.init("http://mochi.test:8888", null, "mochirealm", "user1name", "user1pass", "", ""); Services.logins.addLogin(login2); sendAsyncMessage("setupDone"); }, - QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolProxyCallback]), + QueryInterface: XPCOMUtils.generateQI([parentCi.nsIProtocolProxyCallback]), }); addMessageListener("prepareForNextTest", message => { - Cc["@mozilla.org/network/http-auth-manager;1"]. - getService(Ci.nsIHttpAuthManager). + parentCc["@mozilla.org/network/http-auth-manager;1"]. + getService(parentCi.nsIHttpAuthManager). clearAll(); sendAsyncMessage("prepareForNextTestDone"); }); diff --git a/toolkit/components/passwordmgr/test/mochitest/test_prompt_http.html b/toolkit/components/passwordmgr/test/mochitest/test_prompt_http.html index 99713cc0eb4e..0dc8fdf9cb32 100644 --- a/toolkit/components/passwordmgr/test/mochitest/test_prompt_http.html +++ b/toolkit/components/passwordmgr/test/mochitest/test_prompt_http.html @@ -18,7 +18,6 @@