Bug 1367235 - Additional changes for eslint on testing/xpcshell; r=Standard8

testing/xpcshell/dbg-actors.js

@@ -4,6 +4,8 @@
 
 "use strict";
 
+/* import-globals-from ../../devtools/server/main.js */
+
 const { Promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
 var { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
 const { devtools } = Cu.import("resource://devtools/shared/Loader.jsm", {});

testing/xpcshell/example/unit/import_module.jsm

@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+/* globals __URI__ */
+
 // Module used by test_import_module.js
 
 const EXPORTED_SYMBOLS = [ "MODULE_IMPORTED", "MODULE_URI", "SUBMODULE_IMPORTED", "same_scope", "SUBMODULE_IMPORTED_TO_SCOPE" ];
@@ -14,8 +16,8 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.importRelative(this, "import_sub_module.jsm");
 
 // Prepare two scopes that we can import the submodule into.
-var scope1 = { __URI__: __URI__ };
+var scope1 = { __URI__ };
-var scope2 = { __URI__: __URI__ };
+var scope2 = { __URI__ };
 // First one is the regular path.
 XPCOMUtils.importRelative(scope1, "import_sub_module.jsm");
 scope1.test_obj.i++;

testing/xpcshell/example/unit/load_subscript.js

@@ -2,4 +2,5 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+/* globals subscriptLoaded:true */
 subscriptLoaded = true;

testing/xpcshell/example/unit/location_load.js

@@ -2,5 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+/* globals __LOCATION__ */
+
 // Gets loaded via test_location.js
 do_check_eq(__LOCATION__.leafName, "location_load.js");

testing/xpcshell/example/unit/test_check_nsIException.js

@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
+/* import-globals-from ../../head.js */
+
 function run_test() {
   let env = Components.classes["@mozilla.org/process/environment;1"]
                       .getService(Components.interfaces.nsIEnvironment);

testing/xpcshell/example/unit/test_check_nsIException_failing.js

@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
+/* import-globals-from ../../head.js */
+
 function run_test() {
   do_check_throws_nsIException(function() {
     throw Error("I find your relaxed dishabille unpalatable");

testing/xpcshell/example/unit/test_import_module.js

@@ -4,6 +4,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+/* import-globals-from import_module.jsm */
+/* import-globals-from import_sub_module.jsm */
+
 /**
  * Ensures that tests can import a module in the same folder through:
  * Components.utils.import("resource://test/module.jsm");

testing/xpcshell/example/unit/test_location.js

@@ -4,6 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+/* globals __LOCATION__ */
+
 function run_test() {
   do_check_eq(__LOCATION__.leafName, "test_location.js");
   // also check that __LOCATION__ works via load()

testing/xpcshell/example/unit/test_profile.js

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 function run_test() {
+  /* import-globals-from check_profile.js */
   load("check_profile.js");
   check_do_get_profile(false);
 }

testing/xpcshell/example/unit/test_profile_afterChange.js

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 function run_test() {
+  /* import-globals-from check_profile.js */
   load("check_profile.js");
   check_do_get_profile(true);
 }

testing/xpcshell/head.js

@@ -10,6 +10,20 @@
  * for more information.
  */
 
+/* defined by the harness */
+/* globals _HEAD_FILES, _HEAD_JS_PATH, _JSDEBUGGER_PORT, _JSCOV_DIR,
+    _MOZINFO_JS_PATH, _TEST_FILE, _TEST_NAME, _TESTING_MODULES_DIR,
+    _XPCSHELL_PROCESS:true */
+
+/* defined by XPCShellImpl.cpp */
+/* globals load, sendCommand */
+
+/* must be defined by tests using do_await_remote_message/do_send_remote_message */
+/* globals Cc, Ci */
+
+/* may be defined in test files */
+/* globals run_test */
+
 var _quit = false;
 var _passed = true;
 var _tests_pending = 0;
@@ -119,14 +133,14 @@ try {
   }
 
   let listener = {
-    QueryInterface: function(iid) {
+    QueryInterface(iid) {
       if (!iid.equals(Components.interfaces.nsISupports) &&
           !iid.equals(Components.interfaces.nsIConsoleListener)) {
         throw Components.results.NS_NOINTERFACE;
       }
       return this;
     },
-    observe: function(msg) {
+    observe(msg) {
       if (typeof do_print === "function")
         do_print("CONSOLE_MESSAGE: (" + levelNames[msg.logLevel] + ") " + msg.toString());
     }
@@ -163,7 +177,7 @@ function _Timer(func, delay) {
   _pendingTimers.push(timer);
 }
 _Timer.prototype = {
-  QueryInterface: function(iid) {
+  QueryInterface(iid) {
     if (iid.equals(Components.interfaces.nsITimerCallback) ||
         iid.equals(Components.interfaces.nsISupports))
       return this;
@@ -171,7 +185,7 @@ _Timer.prototype = {
     throw Components.results.NS_ERROR_NO_INTERFACE;
   },
 
-  notify: function(timer) {
+  notify(timer) {
     _pendingTimers.splice(_pendingTimers.indexOf(timer), 1);
 
     // The current nsITimer implementation can undershoot, but even if it
@@ -265,16 +279,16 @@ var _fakeIdleService = {
 
   factory: {
     // nsIFactory
-    createInstance: function(aOuter, aIID) {
+    createInstance(aOuter, aIID) {
       if (aOuter) {
         throw Components.results.NS_ERROR_NO_AGGREGATION;
       }
       return _fakeIdleService.QueryInterface(aIID);
     },
-    lockFactory: function(aLock) {
+    lockFactory(aLock) {
       throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
     },
-    QueryInterface: function(aIID) {
+    QueryInterface(aIID) {
       if (aIID.equals(Components.interfaces.nsIFactory) ||
           aIID.equals(Components.interfaces.nsISupports)) {
         return this;
@@ -287,10 +301,10 @@ var _fakeIdleService = {
   get idleTime() {
     return 0;
   },
-  addIdleObserver: function() {},
+  addIdleObserver() {},
-  removeIdleObserver: function() {},
+  removeIdleObserver() {},
 
-  QueryInterface: function(aIID) {
+  QueryInterface(aIID) {
     // Useful for testing purposes, see test_get_idle.js.
     if (aIID.equals(Components.interfaces.nsIFactory)) {
       return this.factory;
@@ -599,8 +613,7 @@ function _execute_test() {
       }
     }
     _cleanupFunctions = [];
-  }.bind(this)).catch(reportCleanupError)
+  }).catch(reportCleanupError).then(() => complete = true);
-               .then(() => complete = true);
   let thr = Components.classes["@mozilla.org/thread-manager;1"]
                       .getService().currentThread;
   while (!complete) {
@@ -692,7 +705,7 @@ function do_execute_soon(callback, aName) {
                      .getService(Components.interfaces.nsIThreadManager);
 
   tm.dispatchToMainThread({
-    run: function() {
+    run() {
       try {
         callback();
       } catch (e) {
@@ -858,22 +871,20 @@ function do_report_result(passed, text, stack, todo) {
                              "PASS",
                              message);
     }
+  } else if (todo) {
+    _testLogger.testStatus(_TEST_NAME,
+                           name,
+                           "FAIL",
+                           "FAIL",
+                           message);
   } else {
-    if (todo) {
+    _testLogger.testStatus(_TEST_NAME,
-      _testLogger.testStatus(_TEST_NAME,
+                           name,
-                             name,
+                           "FAIL",
-                             "FAIL",
+                           "PASS",
-                             "FAIL",
+                           message,
-                             message);
+                           _format_stack(stack));
-    } else {
+    _abort_failed_test();
-      _testLogger.testStatus(_TEST_NAME,
-                             name,
-                             "FAIL",
-                             "PASS",
-                             message,
-                             _format_stack(stack));
-      _abort_failed_test();
-    }
   }
 }
 
@@ -1139,9 +1150,8 @@ function do_get_minidumpdir() {
                          .createInstance(Components.interfaces.nsILocalFile);
     file.initWithPath(path);
     return file;
-  } else {
-    return do_get_tempdir();
   }
+  return do_get_tempdir();
 }
 
 /**
@@ -1168,7 +1178,7 @@ function do_get_profile(notifyProfileAfterChange = false) {
   let dirSvc = Components.classes["@mozilla.org/file/directory_service;1"]
                          .getService(Components.interfaces.nsIProperties);
   let provider = {
-    getFile: function(prop, persistent) {
+    getFile(prop, persistent) {
       persistent.value = true;
       if (prop == "ProfD" || prop == "ProfLD" || prop == "ProfDS" ||
           prop == "ProfLDS" || prop == "TmpD") {
@@ -1176,7 +1186,7 @@ function do_get_profile(notifyProfileAfterChange = false) {
       }
       return null;
     },
-    QueryInterface: function(iid) {
+    QueryInterface(iid) {
       if (iid.equals(Components.interfaces.nsIDirectoryServiceProvider) ||
           iid.equals(Components.interfaces.nsISupports)) {
         return this;
@@ -1307,7 +1317,7 @@ function run_test_in_child(testFile, optionalCallback) {
 function do_await_remote_message(name, optionalCallback) {
   return new Promise((resolve) => {
     var listener = {
-      receiveMessage: function(message) {
+      receiveMessage(message) {
         if (message.name == name) {
           mm.removeMessageListener(name, listener);
           resolve();