diff --git a/.eslintignore b/.eslintignore index 6a1bfa5f1a8b..7c5d28696d4d 100644 --- a/.eslintignore +++ b/.eslintignore @@ -134,7 +134,6 @@ devtools/server/actors/stylesheets.js devtools/server/tests/browser/storage-*.html !devtools/server/tests/browser/storage-unsecured-iframe.html devtools/server/tests/browser/stylesheets-nested-iframes.html -devtools/server/tests/mochitest/** devtools/server/tests/unit/** devtools/shared/platform/content/test/test_clipboard.html devtools/shared/qrcode/tests/mochitest/test_decode.html diff --git a/devtools/server/tests/mochitest/Debugger.Source.prototype.element-2.js b/devtools/server/tests/mochitest/Debugger.Source.prototype.element-2.js index eab74692130a..7260431428dc 100644 --- a/devtools/server/tests/mochitest/Debugger.Source.prototype.element-2.js +++ b/devtools/server/tests/mochitest/Debugger.Source.prototype.element-2.js @@ -1 +1,4 @@ +"use strict"; + +// eslint-disable-next-line no-debugger debugger; diff --git a/devtools/server/tests/mochitest/Debugger.Source.prototype.element.html b/devtools/server/tests/mochitest/Debugger.Source.prototype.element.html index fcf4c6c851d5..6959ad970d1d 100644 --- a/devtools/server/tests/mochitest/Debugger.Source.prototype.element.html +++ b/devtools/server/tests/mochitest/Debugger.Source.prototype.element.html @@ -1,6 +1,14 @@ - + diff --git a/devtools/server/tests/mochitest/Debugger.Source.prototype.element.js b/devtools/server/tests/mochitest/Debugger.Source.prototype.element.js index 44115b373be6..0fe4157a4401 100644 --- a/devtools/server/tests/mochitest/Debugger.Source.prototype.element.js +++ b/devtools/server/tests/mochitest/Debugger.Source.prototype.element.js @@ -1 +1,6 @@ -function heinrichFun() { franz(); } +/* exported heinrichFun */ +"use strict"; + +function heinrichFun() { + franz(); +} diff --git a/devtools/server/tests/mochitest/animation-data.html b/devtools/server/tests/mochitest/animation-data.html index 01be59548093..79bf3706c03d 100644 --- a/devtools/server/tests/mochitest/animation-data.html +++ b/devtools/server/tests/mochitest/animation-data.html @@ -101,8 +101,10 @@ } diff --git a/devtools/server/tests/mochitest/director-helpers.js b/devtools/server/tests/mochitest/director-helpers.js index fe1f7d394a28..b650884a2853 100644 --- a/devtools/server/tests/mochitest/director-helpers.js +++ b/devtools/server/tests/mochitest/director-helpers.js @@ -1,4 +1,8 @@ -var Cu = Components.utils; +/* exported DirectorRegistryFront, DirectorManagerFront, Task, + newConnectedDebuggerClient, purgeInstalledDirectorScripts */ +"use strict"; + +const Cu = Components.utils; const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {}); const {DebuggerClient} = require("devtools/shared/client/main"); const {DebuggerServer} = require("devtools/server/main"); @@ -25,12 +29,12 @@ const { Task } = require("devtools/shared/task"); **********************************/ function* newConnectedDebuggerClient(opts) { - var transport = DebuggerServer.connectPipe(); - var client = new DebuggerClient(transport); + let transport = DebuggerServer.connectPipe(); + let client = new DebuggerClient(transport); yield client.connect(); - var root = yield client.listTabs(); + let root = yield client.listTabs(); return { client: client, diff --git a/devtools/server/tests/mochitest/hello-actor.js b/devtools/server/tests/mochitest/hello-actor.js index 6031929381fb..abb6afc73fa8 100644 --- a/devtools/server/tests/mochitest/hello-actor.js +++ b/devtools/server/tests/mochitest/hello-actor.js @@ -1,5 +1,7 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ +/* exported HelloActor */ +"use strict"; const protocol = require("devtools/shared/protocol"); diff --git a/devtools/server/tests/mochitest/inspector-eyedropper.html b/devtools/server/tests/mochitest/inspector-eyedropper.html index ded9f392de2f..39705edcc220 100644 --- a/devtools/server/tests/mochitest/inspector-eyedropper.html +++ b/devtools/server/tests/mochitest/inspector-eyedropper.html @@ -1,18 +1,20 @@ - - - - Inspector Eyedropper tests - - - - - - \ No newline at end of file + + + + Inspector Eyedropper tests + + + + + + diff --git a/devtools/server/tests/mochitest/inspector-helpers.js b/devtools/server/tests/mochitest/inspector-helpers.js index 52c3fdc96646..d46c0ce88c5c 100644 --- a/devtools/server/tests/mochitest/inspector-helpers.js +++ b/devtools/server/tests/mochitest/inspector-helpers.js @@ -1,3 +1,9 @@ +/* exported attachURL, promiseDone, assertOwnershipTrees, checkMissing, checkAvailable, + promiseOnce, isSrcChange, isUnretained, isNewRoot, assertSrcChange, assertUnload, + assertFrameLoad, assertChildList, waitForMutation, addTest, addAsyncTest, + runNextTest */ +"use strict"; + var Cu = Components.utils; const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {}); @@ -15,7 +21,6 @@ SimpleTest.registerCleanupFunction(function () { Services.prefs.clearUserPref("devtools.debugger.log"); }); - if (!DebuggerServer.initialized) { DebuggerServer.init(); DebuggerServer.addBrowserActors(); @@ -40,8 +45,8 @@ SimpleTest.registerCleanupFunction(function () { * and disconnect its debugger client. */ function attachURL(url, callback) { - var win = window.open(url, "_blank"); - var client = null; + let win = window.open(url, "_blank"); + let client = null; let cleanup = () => { if (client) { @@ -63,7 +68,8 @@ function attachURL(url, callback) { for (let tab of response.tabs) { if (tab.url === url) { window.removeEventListener("message", loadListener); - client.attachTab(tab.actor, function (aResponse, aTabClient) { + // eslint-disable-next-line max-nested-callbacks + client.attachTab(tab.actor, function (_response, _tabClient) { try { callback(null, client, tab, win.document); } catch (ex) { @@ -125,15 +131,18 @@ function serverOwnershipTree(walker) { return { root: serverOwnershipSubtree(serverWalker, serverWalker.rootDoc), - orphaned: [...serverWalker._orphaned].map(o => serverOwnershipSubtree(serverWalker, o.rawNode)), - retained: [...serverWalker._retainedOrphans].map(o => serverOwnershipSubtree(serverWalker, o.rawNode)) + orphaned: [...serverWalker._orphaned] + .map(o => serverOwnershipSubtree(serverWalker, o.rawNode)), + retained: [...serverWalker._retainedOrphans] + .map(o => serverOwnershipSubtree(serverWalker, o.rawNode)) }; } function clientOwnershipSubtree(node) { return { name: node.actorID, - children: sortOwnershipChildren(node.treeChildren().map(child => clientOwnershipSubtree(child))) + children: sortOwnershipChildren(node.treeChildren() + .map(child => clientOwnershipSubtree(child))) }; } @@ -156,7 +165,8 @@ function ownershipTreeSize(tree) { function assertOwnershipTrees(walker) { let serverTree = serverOwnershipTree(walker); let clientTree = clientOwnershipTree(walker); - is(JSON.stringify(clientTree, null, " "), JSON.stringify(serverTree, null, " "), "Server and client ownership trees should match."); + is(JSON.stringify(clientTree, null, " "), JSON.stringify(serverTree, null, " "), + "Server and client ownership trees should match."); return ownershipTreeSize(clientTree.root); } @@ -189,14 +199,15 @@ function checkAvailable(client, actorID) { to: actorID, type: "garbageAvailableTest", }, response => { - is(response.error, "unrecognizedPacketType", "node list actor should be contactable."); + is(response.error, "unrecognizedPacketType", + "node list actor should be contactable."); deferred.resolve(undefined); }); return deferred.promise; } -function promiseDone(promise) { - promise.then(null, err => { +function promiseDone(currentPromise) { + currentPromise.then(null, err => { ok(false, "Promise failed: " + err); if (err.stack) { dump(err.stack); @@ -207,10 +218,6 @@ function promiseDone(promise) { // Mutation list testing -function isSrcChange(change) { - return (change.type === "attributes" && change.attributeName === "src"); -} - function assertAndStrip(mutations, message, test) { let size = mutations.length; mutations = mutations.filter(test); @@ -245,7 +252,8 @@ function isNewRoot(change) { // Make sure an iframe's src attribute changed and then // strip that mutation out of the list. function assertSrcChange(mutations) { - return assertAndStrip(mutations, "Should have had an iframe source change.", isSrcChange); + return assertAndStrip(mutations, "Should have had an iframe source change.", + isSrcChange); } // Make sure there's an unload in the mutation list and strip @@ -285,7 +293,6 @@ function waitForMutation(walker, test, mutations = []) { return deferred.promise; } - var _tests = []; function addTest(test) { _tests.push(test); @@ -300,7 +307,7 @@ function runNextTest() { SimpleTest.finish(); return; } - var fn = _tests.shift(); + let fn = _tests.shift(); try { fn(); } catch (ex) { diff --git a/devtools/server/tests/mochitest/inspector-search-data.html b/devtools/server/tests/mochitest/inspector-search-data.html index d0d5f9c68b3a..4ca0ba9ac98b 100644 --- a/devtools/server/tests/mochitest/inspector-search-data.html +++ b/devtools/server/tests/mochitest/inspector-search-data.html @@ -15,8 +15,10 @@ } @@ -49,4 +51,4 @@
- \ No newline at end of file + diff --git a/devtools/server/tests/mochitest/inspector-styles-data.html b/devtools/server/tests/mochitest/inspector-styles-data.html index a2a126f0e199..029050167399 100644 --- a/devtools/server/tests/mochitest/inspector-styles-data.html +++ b/devtools/server/tests/mochitest/inspector-styles-data.html @@ -1,8 +1,10 @@ diff --git a/devtools/server/tests/mochitest/inspector_css-properties.html b/devtools/server/tests/mochitest/inspector_css-properties.html index 2c160c92803f..dcbec597ac86 100644 --- a/devtools/server/tests/mochitest/inspector_css-properties.html +++ b/devtools/server/tests/mochitest/inspector_css-properties.html @@ -2,8 +2,10 @@ diff --git a/devtools/server/tests/mochitest/inspector_getImageData.html b/devtools/server/tests/mochitest/inspector_getImageData.html index eebecea9070f..02d2b4d28f29 100644 --- a/devtools/server/tests/mochitest/inspector_getImageData.html +++ b/devtools/server/tests/mochitest/inspector_getImageData.html @@ -7,6 +7,8 @@ diff --git a/devtools/server/tests/mochitest/memory-helpers.js b/devtools/server/tests/mochitest/memory-helpers.js index aea8c4732400..e100a3b06a88 100644 --- a/devtools/server/tests/mochitest/memory-helpers.js +++ b/devtools/server/tests/mochitest/memory-helpers.js @@ -1,14 +1,16 @@ -var Cu = Components.utils; -var Cc = Components.classes; -var Ci = Components.interfaces; +/* exported Task, startServerAndGetSelectedTabMemory, destroyServerAndFinish, + waitForTime, waitUntil */ +"use strict"; -var { require } = Cu.import("resource://devtools/shared/Loader.jsm", {}); +const Cu = Components.utils; + +const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {}); +const Services = require("Services"); const { Task } = require("devtools/shared/task"); -var Services = require("Services"); -var { DebuggerClient } = require("devtools/shared/client/main"); -var { DebuggerServer } = require("devtools/server/main"); +const { DebuggerClient } = require("devtools/shared/client/main"); +const { DebuggerServer } = require("devtools/server/main"); -var { MemoryFront } = require("devtools/shared/fronts/memory"); +const { MemoryFront } = require("devtools/shared/fronts/memory"); // Always log packets when running tests. Services.prefs.setBoolPref("devtools.debugger.log", true); @@ -19,13 +21,13 @@ SimpleTest.registerCleanupFunction(function () { function startServerAndGetSelectedTabMemory() { DebuggerServer.init(); DebuggerServer.addBrowserActors(); - var client = new DebuggerClient(DebuggerServer.connectPipe()); + let client = new DebuggerClient(DebuggerServer.connectPipe()); return client.connect() .then(() => client.listTabs()) .then(response => { - var form = response.tabs[response.selected]; - var memory = MemoryFront(client, form, response); + let form = response.tabs[response.selected]; + let memory = MemoryFront(client, form, response); return { memory, client }; }); @@ -48,5 +50,6 @@ function waitUntil(predicate) { if (predicate()) { return Promise.resolve(true); } - return new Promise(resolve => setTimeout(() => waitUntil(predicate).then(() => resolve(true)), 10)); + return new Promise(resolve => setTimeout(() => waitUntil(predicate) + .then(() => resolve(true)), 10)); } diff --git a/devtools/server/tests/mochitest/nonchrome_unsafeDereference.html b/devtools/server/tests/mochitest/nonchrome_unsafeDereference.html index 6c19d3104184..15e9fd9160bc 100644 --- a/devtools/server/tests/mochitest/nonchrome_unsafeDereference.html +++ b/devtools/server/tests/mochitest/nonchrome_unsafeDereference.html @@ -1,8 +1,10 @@ diff --git a/devtools/server/tests/mochitest/setup-in-child.js b/devtools/server/tests/mochitest/setup-in-child.js index a575faa20ac5..b5614ab1e19c 100644 --- a/devtools/server/tests/mochitest/setup-in-child.js +++ b/devtools/server/tests/mochitest/setup-in-child.js @@ -1,6 +1,8 @@ +"use strict"; + const {Cc, Ci} = require("chrome"); -const cpmm = Cc["@mozilla.org/childprocessmessagemanager;1"]. - getService(Ci.nsIMessageListenerManager); +const cpmm = Cc["@mozilla.org/childprocessmessagemanager;1"] + .getService(Ci.nsIMessageListenerManager); const { DebuggerServer } = require("devtools/server/main"); exports.setupChild = function (a, b, c) { diff --git a/devtools/server/tests/mochitest/setup-in-parent.js b/devtools/server/tests/mochitest/setup-in-parent.js index 9845ee647901..65a65897e358 100644 --- a/devtools/server/tests/mochitest/setup-in-parent.js +++ b/devtools/server/tests/mochitest/setup-in-parent.js @@ -1,3 +1,5 @@ +"use strict"; + var {Ci} = require("chrome"); var Services = require("Services"); diff --git a/devtools/server/tests/mochitest/test_Debugger.Script.prototype.global.html b/devtools/server/tests/mochitest/test_Debugger.Script.prototype.global.html index 77357e608358..ab20610afb0d 100644 --- a/devtools/server/tests/mochitest/test_Debugger.Script.prototype.global.html +++ b/devtools/server/tests/mochitest/test_Debugger.Script.prototype.global.html @@ -14,6 +14,7 @@ Debugger.Script.prototype.global should return innerize globals, not WindowProxi
diff --git a/devtools/server/tests/mochitest/test_Debugger.Source.prototype.element.html b/devtools/server/tests/mochitest/test_Debugger.Source.prototype.element.html index 3cbc223539d3..b1d223f93eda 100644 --- a/devtools/server/tests/mochitest/test_Debugger.Source.prototype.element.html +++ b/devtools/server/tests/mochitest/test_Debugger.Source.prototype.element.html @@ -15,6 +15,7 @@ element to which code is attached (if any), and how.
diff --git a/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionScript.html b/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionScript.html index cbc2ae6155d3..ed186475f5af 100644 --- a/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionScript.html +++ b/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionScript.html @@ -15,6 +15,7 @@ behave when 'eval' is called with no scripted frames active at all.
diff --git a/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html b/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html index 6f5be33f51bd..98c71e594abe 100644 --- a/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html +++ b/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html @@ -16,13 +16,14 @@ JavaScrip appearing in an inline event handler attribute.
diff --git a/devtools/server/tests/mochitest/test_animation_actor-lifetime.html b/devtools/server/tests/mochitest/test_animation_actor-lifetime.html index 158fd42479ef..859d8669469d 100644 --- a/devtools/server/tests/mochitest/test_animation_actor-lifetime.html +++ b/devtools/server/tests/mochitest/test_animation_actor-lifetime.html @@ -11,67 +11,65 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1247243 diff --git a/devtools/server/tests/mochitest/test_connectToChild.html b/devtools/server/tests/mochitest/test_connectToChild.html index f9fca4dfb039..fab3a26f59bd 100644 --- a/devtools/server/tests/mochitest/test_connectToChild.html +++ b/devtools/server/tests/mochitest/test_connectToChild.html @@ -1,4 +1,4 @@ - + - - - Test for Bug 1262439 - - - - - - -Test Document -

- -
-
- - + + + + + + Test for Bug 1262439 + + + + + + +Test Document +

+ +
+
+ + diff --git a/devtools/server/tests/mochitest/test_inspector-pseudoclass-lock.html b/devtools/server/tests/mochitest/test_inspector-pseudoclass-lock.html index cc3810835404..3b8a798551d2 100644 --- a/devtools/server/tests/mochitest/test_inspector-pseudoclass-lock.html +++ b/devtools/server/tests/mochitest/test_inspector-pseudoclass-lock.html @@ -11,30 +11,29 @@ https://bugzilla.mozilla.org/show_bug.cgi?id= diff --git a/devtools/server/tests/mochitest/test_inspector-reload.html b/devtools/server/tests/mochitest/test_inspector-reload.html index 44a54be8288f..55bad8061f6b 100644 --- a/devtools/server/tests/mochitest/test_inspector-reload.html +++ b/devtools/server/tests/mochitest/test_inspector-reload.html @@ -11,26 +11,24 @@ https://bugzilla.mozilla.org/show_bug.cgi?id= diff --git a/devtools/server/tests/mochitest/test_inspector-remove.html b/devtools/server/tests/mochitest/test_inspector-remove.html index ef08121d2d08..88addf9e2052 100644 --- a/devtools/server/tests/mochitest/test_inspector-remove.html +++ b/devtools/server/tests/mochitest/test_inspector-remove.html @@ -11,15 +11,16 @@ https://bugzilla.mozilla.org/show_bug.cgi?id= diff --git a/devtools/server/tests/mochitest/test_inspector-resize.html b/devtools/server/tests/mochitest/test_inspector-resize.html index 7d0b91850e4f..27f3502ed2fc 100644 --- a/devtools/server/tests/mochitest/test_inspector-resize.html +++ b/devtools/server/tests/mochitest/test_inspector-resize.html @@ -11,12 +11,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1222409 diff --git a/devtools/server/tests/mochitest/test_inspector-retain.html b/devtools/server/tests/mochitest/test_inspector-retain.html index ceff4a8560fb..ee0f0f2a7c1d 100644 --- a/devtools/server/tests/mochitest/test_inspector-retain.html +++ b/devtools/server/tests/mochitest/test_inspector-retain.html @@ -11,16 +11,15 @@ https://bugzilla.mozilla.org/show_bug.cgi?id= diff --git a/devtools/server/tests/mochitest/test_inspector-search-front.html b/devtools/server/tests/mochitest/test_inspector-search-front.html index 807942b2d823..fc845a84b06d 100644 --- a/devtools/server/tests/mochitest/test_inspector-search-front.html +++ b/devtools/server/tests/mochitest/test_inspector-search-front.html @@ -10,17 +10,17 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=835896 diff --git a/devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html b/devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html index 58d92573efac..120a3996cd65 100644 --- a/devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html +++ b/devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html @@ -17,10 +17,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1192536 diff --git a/devtools/server/tests/mochitest/test_memory.html b/devtools/server/tests/mochitest/test_memory.html index ba929105c51c..d5e8b21f328a 100644 --- a/devtools/server/tests/mochitest/test_memory.html +++ b/devtools/server/tests/mochitest/test_memory.html @@ -13,12 +13,14 @@ Bug 923275 - Add a memory monitor widget to the developer toolbar 
 
 
 
 
 
 
 
 
 
diff --git a/devtools/server/tests/mochitest/test_memory_attach_01.html b/devtools/server/tests/mochitest/test_memory_attach_01.html
index 2e46f60282ef..3d0187d5ed69 100644
--- a/devtools/server/tests/mochitest/test_memory_attach_01.html
+++ b/devtools/server/tests/mochitest/test_memory_attach_01.html
@@ -13,16 +13,18 @@ Bug 960671 - Test attaching and detaching from a memory actor.
 
 
 
diff --git a/devtools/server/tests/mochitest/test_memory_attach_02.html b/devtools/server/tests/mochitest/test_memory_attach_02.html
index 790290743c8f..f79d66c0a91b 100644
--- a/devtools/server/tests/mochitest/test_memory_attach_02.html
+++ b/devtools/server/tests/mochitest/test_memory_attach_02.html
@@ -13,17 +13,18 @@ Bug 960671 - Test attaching and detaching while in the wrong state.
 
 
 
 
 
 
 

 
diff --git a/devtools/server/tests/mochitest/test_setupInParentChild.html b/devtools/server/tests/mochitest/test_setupInParentChild.html
index 5c05e64db676..d4b1f2071152 100644
--- a/devtools/server/tests/mochitest/test_setupInParentChild.html
+++ b/devtools/server/tests/mochitest/test_setupInParentChild.html
@@ -12,6 +12,7 @@ Bug 1181100 - Test DebuggerServerConnection.setupInParent and DebuggerServer.set
 
 
 
 

diff --git a/devtools/server/tests/mochitest/test_styles-applied.html b/devtools/server/tests/mochitest/test_styles-applied.html
index be446c69908a..3fd8c9eb10a8 100644
--- a/devtools/server/tests/mochitest/test_styles-applied.html
+++ b/devtools/server/tests/mochitest/test_styles-applied.html
@@ -11,25 +11,23 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   
   
   
   
   
   
   
 

diff --git a/devtools/server/tests/mochitest/test_websocket-server.html b/devtools/server/tests/mochitest/test_websocket-server.html
index 583d96dd9ef1..f6b97d76d3f6 100644
--- a/devtools/server/tests/mochitest/test_websocket-server.html
+++ b/devtools/server/tests/mochitest/test_websocket-server.html
@@ -9,7 +9,9 @@