From 3b243b7e275374f69bbfd375ea1b9372b5551d6b Mon Sep 17 00:00:00 2001 From: Vincent W Date: Tue, 22 Jan 2019 21:26:30 +0000 Subject: [PATCH] Bug 1508985 - Enable ESLint for dom/tests/browser/ (automatic changes) r=Standard8,qdot Differential Revision: https://phabricator.services.mozilla.com/D14017 --HG-- extra : moz-landing-system : lando --- dom/tests/browser/beforeunload_test_page.html | 2 +- dom/tests/browser/browser_ConsoleAPITests.js | 32 +- .../browser_ConsoleAPI_originAttributes.js | 5 +- .../browser/browser_ConsoleStorageAPITests.js | 12 +- ...rowser_ConsoleStoragePBTest_perwindowpb.js | 6 +- dom/tests/browser/browser_allocateGigabyte.js | 4 +- ...ser_beforeunload_between_chrome_content.js | 16 +- dom/tests/browser/browser_bug1004814.js | 10 +- dom/tests/browser/browser_bug1238427.js | 2 +- dom/tests/browser/browser_bug1316330.js | 2 +- dom/tests/browser/browser_bug396843.js | 328 +++++++++--------- ...ocus_steal_from_chrome_during_mousedown.js | 2 +- dom/tests/browser/browser_frame_elements.js | 10 +- dom/tests/browser/browser_hasbeforeunload.js | 60 ++-- .../browser_largeAllocation_non_win32.js | 8 +- .../browser/browser_largeAllocation_win32.js | 4 +- .../browser/browser_localStorage_e10s.js | 96 ++++- ...rowser_localStorage_privatestorageevent.js | 14 +- .../browser/browser_noopener_null_uri.js | 2 +- dom/tests/browser/browser_persist_cookies.js | 2 +- .../browser_persist_mixed_content_image.js | 2 +- .../browser_test_new_window_from_content.js | 4 +- .../browser_test_toolbars_visibility.js | 2 +- dom/tests/browser/browser_xhr_sandbox.js | 4 +- dom/tests/browser/helper_largeAllocation.js | 18 +- dom/tests/browser/page_localstorage_e10s.html | 2 +- .../browser_test_performance_metrics.js | 14 +- .../browser/perfmetrics/ping_worker.html | 6 +- .../browser/perfmetrics/ping_worker2.html | 2 +- dom/tests/browser/shared_worker.js | 6 +- dom/tests/browser/test-console-api.html | 6 +- dom/tests/browser/test_bug1004814.html | 2 +- .../test_new_window_from_content_child.html | 4 +- dom/tests/browser/worker_bug1004814.js | 6 +- 34 files changed, 379 insertions(+), 316 deletions(-) diff --git a/dom/tests/browser/beforeunload_test_page.html b/dom/tests/browser/beforeunload_test_page.html index 44222fbd75ae..4ef3bb56a249 100644 --- a/dom/tests/browser/beforeunload_test_page.html +++ b/dom/tests/browser/beforeunload_test_page.html @@ -84,7 +84,7 @@ reset() { this.popInner(this._innerEventHandlers.length); this.popOuter(this._outerEventHandlers.length); - } + }, }; diff --git a/dom/tests/browser/browser_ConsoleAPITests.js b/dom/tests/browser/browser_ConsoleAPITests.js index 2bb7eea6b3ba..23caf4541892 100644 --- a/dom/tests/browser/browser_ConsoleAPITests.js +++ b/dom/tests/browser/browser_ConsoleAPITests.js @@ -65,7 +65,7 @@ function spawnWithObserver(browser, observerFunc, func) { // Call the initialization function (if present) func ? ("(" + func.toString() + ")();") : "", "});", - ].join('\n'); + ].join("\n"); return ContentTask.spawn(browser, null, new Function(source)); } @@ -122,7 +122,7 @@ function testConsoleData(aMessageObject) { } default: { is(aMessageObject.arguments.length, gArgs.length, "arguments.length matches"); - gArgs.forEach(function (a, i) { + gArgs.forEach(function(a, i) { // Waive Xray so that we don't get messed up by Xray ToString. // // It'd be nice to just use XPCNativeWrapper.unwrap here, but there are @@ -270,7 +270,7 @@ async function startTraceTest(browser) { {columnNumber: 9, filename: TEST_URI, functionName: "window.foobar585956c", lineNumber: 6}, {columnNumber: 16, filename: TEST_URI, functionName: "foobar585956b", lineNumber: 11}, {columnNumber: 16, filename: TEST_URI, functionName: "foobar585956a", lineNumber: 15}, - {columnNumber: 1, filename: TEST_URI, functionName: "onclick", lineNumber: 1} + {columnNumber: 1, filename: TEST_URI, functionName: "onclick", lineNumber: 1}, ]; }); @@ -290,7 +290,7 @@ function testLocationData(aMessageObject) { is(aMessageObject.lineNumber, gArgs[0].lineNumber, "lineNumber matches"); is(aMessageObject.functionName, gArgs[0].functionName, "functionName matches"); is(aMessageObject.arguments.length, gArgs[0].arguments.length, "arguments.length matches"); - gArgs[0].arguments.forEach(function (a, i) { + gArgs[0].arguments.forEach(function(a, i) { is(aMessageObject.arguments[i], a, "correct arg " + i); }); @@ -301,7 +301,7 @@ async function startLocationTest(browser) { await spawnWithObserver(browser, testLocationData, function(opts) { gLevel = "log"; gArgs = [ - {filename: TEST_URI, functionName: "foobar646025", arguments: ["omg", "o", "d"], lineNumber: 19} + {filename: TEST_URI, functionName: "foobar646025", arguments: ["omg", "o", "d"], lineNumber: 19}, ]; }); @@ -341,13 +341,11 @@ function testConsoleGroup(aMessageObject) { is(aMessageObject.groupName, "a group", "groupCollapsed groupName matches"); is(aMessageObject.arguments[0], "a", "groupCollapsed arguments[0] matches"); is(aMessageObject.arguments[1], "group", "groupCollapsed arguments[0] matches"); - } - else if (aMessageObject.level == "group") { + } else if (aMessageObject.level == "group") { is(aMessageObject.groupName, "b group", "group groupName matches"); is(aMessageObject.arguments[0], "b", "group arguments[0] matches"); is(aMessageObject.arguments[1], "group", "group arguments[1] matches"); - } - else if (aMessageObject.level == "groupEnd") { + } else if (aMessageObject.level == "groupEnd") { is(aMessageObject.groupName, "b group", "groupEnd groupName matches"); } @@ -374,7 +372,7 @@ function testConsoleTime(aMessageObject) { is(aMessageObject.functionName, gArgs[0].functionName, "functionName matches"); is(aMessageObject.timer.name, gArgs[0].timer.name, "timer.name matches"); - gArgs[0].arguments.forEach(function (a, i) { + gArgs[0].arguments.forEach(function(a, i) { is(aMessageObject.arguments[i], a, "correct arg " + i); }); @@ -388,7 +386,7 @@ async function startTimeTest(browser) { {filename: TEST_URI, lineNumber: 23, functionName: "startTimer", arguments: ["foo"], timer: { name: "foo" }, - } + }, ]; }); @@ -412,7 +410,7 @@ function testConsoleTimeEnd(aMessageObject) { info("timer duration: " + aMessageObject.timer.duration); ok(aMessageObject.timer.duration >= 0, "timer duration is positive"); - gArgs[0].arguments.forEach(function (a, i) { + gArgs[0].arguments.forEach(function(a, i) { is(aMessageObject.arguments[i], a, "correct arg " + i); }); @@ -445,7 +443,7 @@ function testConsoleTimeStamp(aMessageObject) { is(aMessageObject.functionName, gArgs[0].functionName, "functionName matches"); ok(aMessageObject.timeStamp > 0, "timeStamp is a positive value"); - gArgs[0].arguments.forEach(function (a, i) { + gArgs[0].arguments.forEach(function(a, i) { is(aMessageObject.arguments[i], a, "correct arg " + i); }); @@ -457,8 +455,8 @@ async function startTimeStampTest(browser) { gLevel = "timeStamp"; gArgs = [ {filename: TEST_URI, lineNumber: 58, functionName: "timeStamp", - arguments: ["!!!"] - } + arguments: ["!!!"], + }, ]; }); @@ -486,8 +484,8 @@ async function startEmptyTimeStampTest(browser) { gLevel = "timeStamp"; gArgs = [ {filename: TEST_URI, lineNumber: 58, functionName: "timeStamp", - arguments: [] - } + arguments: [], + }, ]; }); diff --git a/dom/tests/browser/browser_ConsoleAPI_originAttributes.js b/dom/tests/browser/browser_ConsoleAPI_originAttributes.js index dc85765b30a4..3ae0731c2b7f 100644 --- a/dom/tests/browser/browser_ConsoleAPI_originAttributes.js +++ b/dom/tests/browser/browser_ConsoleAPI_originAttributes.js @@ -40,11 +40,10 @@ const ConsoleObserver = { finish(); } - } + }, }; -function test() -{ +function test() { ConsoleObserver.init(); waitForExplicitFinish(); diff --git a/dom/tests/browser/browser_ConsoleStorageAPITests.js b/dom/tests/browser/browser_ConsoleStorageAPITests.js index fc2217207d83..7e68c13e563c 100644 --- a/dom/tests/browser/browser_ConsoleStorageAPITests.js +++ b/dom/tests/browser/browser_ConsoleStorageAPITests.js @@ -3,14 +3,12 @@ const TEST_URI_NAV = "http://example.com/browser/dom/tests/browser/"; -function tearDown() -{ +function tearDown() { while (gBrowser.tabs.length > 1) gBrowser.removeCurrentTab(); } -add_task(async function() -{ +add_task(async function() { // Don't cache removed tabs, so "clear console cache on tab close" triggers. await SpecialPowers.pushPrefEnv({ set: [[ "browser.tabs.max_tabs_undo", 0 ]] }); @@ -35,7 +33,7 @@ add_task(async function() let ConsoleObserver = { QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]), - observe: function(aSubject, aTopic, aData) { + observe(aSubject, aTopic, aData) { if (aTopic == "console-storage-cache-event") { apiCallCount++; if (apiCallCount == 4) { @@ -49,7 +47,7 @@ add_task(async function() resolve(windowId); } } - } + }, }; Services.obs.addObserver(ConsoleObserver, "console-storage-cache-event"); @@ -85,7 +83,7 @@ add_task(async function() browser = gBrowser.selectedBrowser; // Spin the event loop to make sure everything is cleared. - await ContentTask.spawn(browser, null, function () { + await ContentTask.spawn(browser, null, function() { return Promise.resolve(); }); diff --git a/dom/tests/browser/browser_ConsoleStoragePBTest_perwindowpb.js b/dom/tests/browser/browser_ConsoleStoragePBTest_perwindowpb.js index a5d1f8104650..0ec94ac8db79 100644 --- a/dom/tests/browser/browser_ConsoleStoragePBTest_perwindowpb.js +++ b/dom/tests/browser/browser_ConsoleStoragePBTest_perwindowpb.js @@ -29,7 +29,7 @@ function test() { function doTest(aIsPrivateMode, aWindow, aCallback) { BrowserTestUtils.browserLoaded(aWindow.gBrowser.selectedBrowser).then(() => { consoleObserver = { - observe: function(aSubject, aTopic, aData) { + observe(aSubject, aTopic, aData) { if (aTopic == "console-api-log-event") { afterEvents = ConsoleAPIStorage.getEvents(innerID); is(beforeEvents.length == afterEvents.length - 1, storageShouldOccur, @@ -40,7 +40,7 @@ function test() { aCallback(); }); } - } + }, }; aWindow.Services.obs.addObserver( @@ -63,7 +63,7 @@ function test() { // call whenNewWindowLoaded() instead of testOnWindow() on your test. executeSoon(() => aCallback(aWin)); }); - }; + } // this function is called after calling finish() on the test. registerCleanupFunction(function() { diff --git a/dom/tests/browser/browser_allocateGigabyte.js b/dom/tests/browser/browser_allocateGigabyte.js index 0c2c170ef29f..4ec45b2f6056 100644 --- a/dom/tests/browser/browser_allocateGigabyte.js +++ b/dom/tests/browser/browser_allocateGigabyte.js @@ -21,7 +21,7 @@ add_task(async function() { await SpecialPowers.pushPrefEnv({ set: [ ["dom.largeAllocationHeader.enabled", true], - ] + ], }); // A toplevel tab should be able to navigate cross process! @@ -36,7 +36,7 @@ add_task(async function() { // Allocate a gigabyte of memory in the content process await ContentTask.spawn(aBrowser, null, () => { - let arrayBuffer = new ArrayBuffer(1024*1024*1024); + let arrayBuffer = new ArrayBuffer(1024 * 1024 * 1024); ok(arrayBuffer, "Successfully allocated a gigabyte of memory in content process"); }); }); diff --git a/dom/tests/browser/browser_beforeunload_between_chrome_content.js b/dom/tests/browser/browser_beforeunload_between_chrome_content.js index edb30920b7de..6c26eacc4b61 100644 --- a/dom/tests/browser/browser_beforeunload_between_chrome_content.js +++ b/dom/tests/browser/browser_beforeunload_between_chrome_content.js @@ -1,7 +1,7 @@ const TEST_URL = "http://www.example.com/browser/dom/tests/browser/dummy.html"; function pageScript() { - window.addEventListener("beforeunload", function (event) { + window.addEventListener("beforeunload", function(event) { var str = "Leaving?"; event.returnValue = str; return str; @@ -10,7 +10,7 @@ function pageScript() { function injectBeforeUnload(browser) { return ContentTask.spawn(browser, null, async function() { - content.window.addEventListener("beforeunload", function (event) { + content.window.addEventListener("beforeunload", function(event) { sendAsyncMessage("Test:OnBeforeUnloadReceived"); var str = "Leaving?"; event.returnValue = str; @@ -59,7 +59,7 @@ add_task(async function() { await BrowserTestUtils.loadURI(browser, "about:support"); await Promise.all([ dialogShown1, - BrowserTestUtils.browserLoaded(browser) + BrowserTestUtils.browserLoaded(browser), ]); is(beforeUnloadCount, 1, "Should have received one beforeunload event."); @@ -77,7 +77,7 @@ add_task(async function() { gBrowser.goForward(); await Promise.all([ dialogShown2, - BrowserTestUtils.browserLoaded(browser) + BrowserTestUtils.browserLoaded(browser), ]); is(beforeUnloadCount, 2, "Should have received two beforeunload events."); @@ -101,7 +101,7 @@ add_task(async function() { ok(!browser.isRemoteBrowser, "Browser should not be remote."); await ContentTask.spawn(browser, null, async function() { - content.window.addEventListener("beforeunload", function (event) { + content.window.addEventListener("beforeunload", function(event) { sendAsyncMessage("Test:OnBeforeUnloadReceived"); var str = "Leaving?"; event.returnValue = str; @@ -114,7 +114,7 @@ add_task(async function() { await BrowserTestUtils.loadURI(browser, TEST_URL); await Promise.all([ dialogShown1, - BrowserTestUtils.browserLoaded(browser) + BrowserTestUtils.browserLoaded(browser), ]); is(beforeUnloadCount, 1, "Should have received one beforeunload event."); ok(browser.isRemoteBrowser, "Browser should be remote."); @@ -124,7 +124,7 @@ add_task(async function() { gBrowser.goBack(); await BrowserTestUtils.browserLoaded(browser); await ContentTask.spawn(browser, null, async function() { - content.window.addEventListener("beforeunload", function (event) { + content.window.addEventListener("beforeunload", function(event) { sendAsyncMessage("Test:OnBeforeUnloadReceived"); var str = "Leaving?"; event.returnValue = str; @@ -138,7 +138,7 @@ add_task(async function() { gBrowser.goForward(); await Promise.all([ dialogShown2, - BrowserTestUtils.browserLoaded(browser) + BrowserTestUtils.browserLoaded(browser), ]); is(beforeUnloadCount, 2, "Should have received two beforeunload events."); diff --git a/dom/tests/browser/browser_bug1004814.js b/dom/tests/browser/browser_bug1004814.js index c105c2eda3c3..2db9cd4a4d0c 100644 --- a/dom/tests/browser/browser_bug1004814.js +++ b/dom/tests/browser/browser_bug1004814.js @@ -5,23 +5,23 @@ add_task(async function() { await BrowserTestUtils.withNewTab("about:blank", async function(aBrowser) { - let duration = await ContentTask.spawn(aBrowser, null, function (opts) { + let duration = await ContentTask.spawn(aBrowser, null, function(opts) { const TEST_URI = "http://example.com/browser/dom/tests/browser/test_bug1004814.html"; return new Promise(resolve => { let ConsoleObserver = { QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]), - observe: function(aSubject, aTopic, aData) { + observe(aSubject, aTopic, aData) { var obj = aSubject.wrappedJSObject; - if (obj.arguments.length != 1 || obj.arguments[0] != 'bug1004814' || - obj.level != 'timeEnd') { + if (obj.arguments.length != 1 || obj.arguments[0] != "bug1004814" || + obj.level != "timeEnd") { return; } Services.obs.removeObserver(this, "console-api-log-event"); resolve(obj.timer.duration); - } + }, }; Services.obs.addObserver(ConsoleObserver, "console-api-log-event"); diff --git a/dom/tests/browser/browser_bug1238427.js b/dom/tests/browser/browser_bug1238427.js index ee620cc69b2f..6d8807a7a3b5 100644 --- a/dom/tests/browser/browser_bug1238427.js +++ b/dom/tests/browser/browser_bug1238427.js @@ -23,7 +23,7 @@ add_task(async function() { // it will show up as a non-shutdown leak. await BrowserTestUtils.withNewTab({ gBrowser, - url: TEST_URI + url: TEST_URI, }, function(browser) { /* ... */ }); ok(true, "Need to do something in this test"); diff --git a/dom/tests/browser/browser_bug1316330.js b/dom/tests/browser/browser_bug1316330.js index 43a7902271ea..0302f9480fe1 100644 --- a/dom/tests/browser/browser_bug1316330.js +++ b/dom/tests/browser/browser_bug1316330.js @@ -1,6 +1,6 @@ const URL = "data:text/html, diff --git a/dom/tests/browser/perfmetrics/ping_worker2.html b/dom/tests/browser/perfmetrics/ping_worker2.html index daf2d58c6e9c..6f6dfc66e485 100644 --- a/dom/tests/browser/perfmetrics/ping_worker2.html +++ b/dom/tests/browser/perfmetrics/ping_worker2.html @@ -7,7 +7,7 @@ var shared; function init() { - shared = new SharedWorker('shared_worker.js'); + shared = new SharedWorker("shared_worker.js"); shared.port.start(); for (let i = 0; i++; i < 10) shared.port.postMessage(["ok"]); } diff --git a/dom/tests/browser/shared_worker.js b/dom/tests/browser/shared_worker.js index 92702fdc77fc..f2fd14951e1e 100644 --- a/dom/tests/browser/shared_worker.js +++ b/dom/tests/browser/shared_worker.js @@ -3,7 +3,7 @@ onconnect = function(e) { var port = e.ports[0]; port.onmessage = function(e) { - var workerResult = 'Result: ' + (e.data[0] * e.data[1]); + var workerResult = "Result: " + (e.data[0] * e.data[1]); port.postMessage(e.data[0]); - } -} + }; +}; diff --git a/dom/tests/browser/test-console-api.html b/dom/tests/browser/test-console-api.html index b34cc08d5c3c..5bd28683334f 100644 --- a/dom/tests/browser/test-console-api.html +++ b/dom/tests/browser/test-console-api.html @@ -4,11 +4,11 @@ diff --git a/dom/tests/browser/test_new_window_from_content_child.html b/dom/tests/browser/test_new_window_from_content_child.html index e5b8e01e63e6..9e3f7016d9c0 100644 --- a/dom/tests/browser/test_new_window_from_content_child.html +++ b/dom/tests/browser/test_new_window_from_content_child.html @@ -13,12 +13,12 @@