Bug 1230193 - Finish enabling ESLint rule no-undef for devtools/. r?jdescottes
MozReview-Commit-ID: EVFivqFNy8a
--- a/devtools/.eslintrc.js
+++ b/devtools/.eslintrc.js
@@ -8,25 +8,16 @@ module.exports = {
"exports": true,
"isWorker": true,
"loader": true,
"module": true,
"reportError": true,
"require": true,
},
"overrides": [{
- // XXX Bug 1230193. We're still working on enabling no-undef for these test
- // directories.
- "files": [
- "server/tests/mochitest/**",
- ],
- "rules": {
- "no-undef": "off",
- }
- }, {
"files": [
"client/framework/**",
],
"rules": {
"no-return-assign": "off",
}
}, {
"files": [
--- a/devtools/server/tests/mochitest/.eslintrc.js
+++ b/devtools/server/tests/mochitest/.eslintrc.js
@@ -1,6 +1,6 @@
"use strict";
module.exports = {
// Extend from the common devtools mochitest eslintrc config.
- "extends": "../../../.eslintrc.xpcshell.js"
+ "extends": "../../../.eslintrc.mochitests.js"
};
--- a/devtools/server/tests/mochitest/Debugger.Source.prototype.element.js
+++ b/devtools/server/tests/mochitest/Debugger.Source.prototype.element.js
@@ -1,6 +1,7 @@
/* exported heinrichFun */
+/* global franz */
"use strict";
function heinrichFun() {
franz();
}
--- a/devtools/server/tests/mochitest/test_connectToFrame.html
+++ b/devtools/server/tests/mochitest/test_connectToFrame.html
@@ -9,16 +9,19 @@ Bug 966991 - Test DebuggerServer.connect
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
</head>
<body>
<pre id="test">
<script type="application/javascript">
"use strict";
+// Part of this is a frame script.
+/* eslint-env mozilla/frame-script */
+
const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DebuggerServer } = require("devtools/server/main");
window.onload = function() {
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({
--- a/devtools/server/tests/mochitest/test_css-logic-media-queries.html
+++ b/devtools/server/tests/mochitest/test_css-logic-media-queries.html
@@ -26,16 +26,17 @@ Test that css-logic handles media-querie
<div></div>
<script type="application/javascript">
"use strict";
window.onload = function() {
const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
const Services = require("Services");
const {CssLogic} = require("devtools/server/actors/inspector/css-logic");
+ const InspectorUtils = require("InspectorUtils");
SimpleTest.waitForExplicitFinish();
const div = document.querySelector("div");
const cssLogic = new CssLogic(InspectorUtils.isInheritedProperty);
cssLogic.highlight(div);
cssLogic.processMatchedSelectors();
--- a/devtools/server/tests/mochitest/test_getProcess.html
+++ b/devtools/server/tests/mochitest/test_getProcess.html
@@ -9,16 +9,19 @@ Bug 1060093 - Test DebuggerServer.getPro
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
</head>
<body>
<pre id="test">
<script type="application/javascript">
"use strict";
+// Part of this is a frame script.
+/* eslint-env mozilla/frame-script */
+
const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
const {DebuggerClient} = require("devtools/shared/client/debugger-client");
const {DebuggerServer} = require("devtools/server/main");
const Services = require("Services");
window.onload = function() {
SimpleTest.waitForExplicitFinish();
--- a/devtools/server/tests/mochitest/test_inspector-pseudoclass-lock.html
+++ b/devtools/server/tests/mochitest/test_inspector-pseudoclass-lock.html
@@ -15,16 +15,18 @@ https://bugzilla.mozilla.org/show_bug.cg
const KNOWN_PSEUDOCLASSES = [":hover", ":active", ":focus"];
window.onload = function() {
SimpleTest.waitForExplicitFinish();
runNextTest();
};
+const InspectorUtils = require("InspectorUtils");
+
let gInspectee = null;
let gWalker = null;
let gCleanupConnection = null;
function setup(callback) {
const url = document.getElementById("inspectorContent").href;
gCleanupConnection = attachURL(url, function(err, client, tab, doc) {
gInspectee = doc;
--- a/devtools/server/tests/mochitest/test_webextension-addon-debugging-connect.html
+++ b/devtools/server/tests/mochitest/test_webextension-addon-debugging-connect.html
@@ -17,18 +17,20 @@ Bug 1302702 - Test connect to a webexten
<script type="application/javascript">
"use strict";
async function test_connect_addon(oopMode) {
// Install and start a test webextension.
const extension = ExtensionTestUtils.loadExtension({
useAddonManager: "temporary",
background: function() {
+ /* eslint-disable no-undef */
browser.test.log("background script executed");
browser.test.sendMessage("background page ready");
+ /* eslint-enable no-undef */
},
});
await extension.startup();
await extension.awaitMessage("background page ready");
// Connect a DebuggerClient.
const transport = DebuggerServer.connectPipe();
const client = new DebuggerClient(transport);