Bug 1497604 - Enable ESLint for dom/cache (manual changes) r=Standard8,hsivonen

Depends on D20943

Differential Revision: https://phabricator.services.mozilla.com/D20944

--HG--
extra : moz-landing-system : lando

.eslintignore

@@ -170,8 +170,6 @@ dom/base/test/unit_ipc/**
 dom/base/test/jsmodules/**
 dom/bindings/**
 dom/browser-element/**
-dom/cache/test/mochitest/**
-dom/cache/test/xpcshell/**
 dom/canvas/**
 dom/encoding/**
 dom/events/**

dom/cache/test/mochitest/browser_cache_pb_window.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-shadow */
 var name = "pb-window-cache";
 
 function testMatch(browser) {

dom/cache/test/mochitest/driver.js

@@ -49,6 +49,8 @@ function runTests(testFile, order) {
   }
 
   function importDrivers() {
+    /* import-globals-from worker_driver.js */
+    /* import-globals-from serviceworker_driver.js */
     return Promise.all([loadScript("worker_driver.js"),
                         loadScript("serviceworker_driver.js")]);
   }

dom/cache/test/mochitest/test_cache.js

@@ -1,3 +1,5 @@
+/* global context testDone:true */
+
 var c = null;
 var request = "http://example.com/hmm?q=foobar" + context;
 var response = new Response("This is some Response!");
@@ -51,16 +53,16 @@ caches.open(name).then(function(openCache) {
   return Promise.all([snafu, snafu.match(keys[0]), snafu.match("ftp://invalid")]);
 }).then(function(args) {
   var snafu = args[0];
-  var response = args[1];
-  ok(response instanceof Response, "value should be a Response");
-  is(response.status, 200, "Response status should be 200");
+  var res = args[1];
+  ok(res instanceof Response, "value should be a Response");
+  is(res.status, 200, "Response status should be 200");
   is(undefined, args[2], "Match with invalid scheme should resolve undefined");
-  return Promise.all([snafu, snafu.put("./cachekey2", response)]);
+  return Promise.all([snafu, snafu.put("./cachekey2", res)]);
 }).then(function(args) {
   var snafu = args[0];
   return snafu.match("./cachekey2");
-}).then(function(response) {
-  return response.text().then(function(v) {
+}).then(function(res) {
+  return res.text().then(function(v) {
     is(v, "Hello world", "Response body should match original");
   });
 }).then(function() {

dom/cache/test/mochitest/test_cache_add.js

@@ -1,3 +1,5 @@
+/* global context testDone:true */
+
 var singleUrl = "./test_cache_add.js";
 var urlList = [
   "./empty.html",

dom/cache/test/mochitest/test_cache_delete.js

@@ -1,5 +1,6 @@
+/* global context testDone:true */
+
 var name = "delete" + context;
-var c;
 
 function setupTest(reqs) {
   return new Promise(function(resolve, reject) {

dom/cache/test/mochitest/test_cache_https.js

@@ -1,12 +1,14 @@
+/* global context testDone:true */
+
 var cache = null;
 var name = "https_" + context;
 var urlBase = "https://example.com/tests/dom/cache/test/mochitest";
 var url1 = urlBase + "/test_cache.js";
 var url2 = urlBase + "/test_cache_add.js";
 
-function addOpaque(cache, url) {
+function addOpaque(c, url) {
   return fetch(new Request(url, { mode: "no-cors" })).then(function(response) {
-    return cache.put(url, response);
+    return c.put(url, response);
   });
 }
 

dom/cache/test/mochitest/test_cache_keys.js

@@ -1,3 +1,5 @@
+/* global context testDone:true */
+
 var name = "keys" + context;
 var c;
 
@@ -35,9 +37,9 @@ caches.open(name).then(function(cache) {
   ok(keys[0].url.includes(tests[1]), "Valid URL");
   // Try to see if ignoreSearch works as expected.
   return c.keys(new Request("//mochi.test:8888/?foo"), {ignoreSearch: true});
-}).then(function(keys) {
-  is(keys.length, tests.length, "Same number of elements");
-  keys.forEach(function(r, i) {
+}).then(function(key_arr) {
+  is(key_arr.length, tests.length, "Same number of elements");
+  key_arr.forEach(function(r, i) {
     ok(r instanceof Request, "Valid request object");
     ok(r.url.includes(tests[i]), "Valid URL");
   });

dom/cache/test/mochitest/test_cache_matchAll_request.js

@@ -1,6 +1,8 @@
-var request1 = new Request("//mochi.test:8888/?1&" + context + "#fragment");
-var request2 = new Request("//mochi.test:8888/?2&" + context);
-var request3 = new Request("//mochi.test:8888/?3&" + context);
+/* global context testDone:true */
+
+var req1 = new Request("//mochi.test:8888/?1&" + context + "#fragment");
+var req2 = new Request("//mochi.test:8888/?2&" + context);
+var req3 = new Request("//mochi.test:8888/?3&" + context);
 var requestWithAltQS = new Request("//mochi.test:8888/?queryString");
 var unknownRequest = new Request("//mochi.test:8888/non/existing/path?" + context);
 var response1, response3;
@@ -25,30 +27,30 @@ function checkResponse(r, response, responseText) {
   });
 }
 
-fetch(new Request(request1)).then(function(r) {
+fetch(new Request(req1)).then(function(r) {
   response1 = r;
   return response1.text();
 }).then(function(text) {
   response1Text = text;
-  return fetch(new Request(request3));
+  return fetch(new Request(req3));
 }).then(function(r) {
   response3 = r;
   return response3.text();
 }).then(function(text) {
   response3Text = text;
-  return testRequest(request1, request2, request3, unknownRequest,
+  return testRequest(req1, req2, req3, unknownRequest,
                      requestWithAltQS,
-                     request1.url.replace("#fragment", "#other"));
+                     req1.url.replace("#fragment", "#other"));
 }).then(function() {
-  return testRequest(request1.url, request2.url, request3.url,
+  return testRequest(req1.url, req2.url, req3.url,
                      unknownRequest.url, requestWithAltQS.url,
-                     request1.url.replace("#fragment", "#other"));
+                     req1.url.replace("#fragment", "#other"));
 }).then(function() {
   testDone();
 });
 
 // The request arguments can either be a URL string, or a Request object.
-function testRequest(request1, request2, request3, unknownRequest,
+function testRequest(request1, request2, request3, unknownReq,
                      requestWithAlternateQueryString,
                      requestWithDifferentFragment) {
   return caches.open(name).then(function(cache) {
@@ -133,10 +135,10 @@ function testRequest(request1, request2, request3, unknownRequest,
         ok(!hasCache, "The wrong cache should still not exist");
       });
   }).then(function() {
-    return c.matchAll(unknownRequest);
+    return c.matchAll(unknownReq);
   }).then(function(r) {
     is(r.length, 0, "Searching for an unknown request should not succeed");
-    return caches.match(unknownRequest, {cacheName: name});
+    return caches.match(unknownReq, {cacheName: name});
   }).then(function(r) {
     is(typeof r, "undefined", "Searching for an unknown request should not succeed");
     // Make sure that cacheName is ignored on Cache

dom/cache/test/mochitest/test_cache_match_request.js

@@ -1,6 +1,8 @@
-var request = new Request("//mochi.test:8888/?" + context + "#fragment");
+/* global context testDone:true */
+
+var req = new Request("//mochi.test:8888/?" + context + "#fragment");
 var requestWithAltQS = new Request("//mochi.test:8888/?queryString");
-var unknownRequest = new Request("//mochi.test:8888/non/existing/path?" + context);
+var unknownReq = new Request("//mochi.test:8888/non/existing/path?" + context);
 var response;
 var c;
 var responseText;
@@ -25,16 +27,16 @@ function checkResponse(r, expectedBody) {
     }
   });
 }
-fetch(new Request(request)).then(function(r) {
+fetch(new Request(req)).then(function(r) {
   response = r;
   return response.text();
 }).then(function(text) {
   responseText = text;
-  return testRequest(request, unknownRequest, requestWithAltQS,
-                     request.url.replace("#fragment", "#other"));
+  return testRequest(req, unknownReq, requestWithAltQS,
+                     req.url.replace("#fragment", "#other"));
 }).then(function() {
-  return testRequest(request.url, unknownRequest.url, requestWithAltQS.url,
-                     request.url.replace("#fragment", "#other"));
+  return testRequest(req.url, unknownReq.url, requestWithAltQS.url,
+                     req.url.replace("#fragment", "#other"));
 }).then(function() {
   testDone();
 });
@@ -72,11 +74,11 @@ function testRequest(request, unknownRequest, requestWithAlternateQueryString,
     return Promise.all(
       ["HEAD", "POST", "PUT", "DELETE", "OPTIONS"]
         .map(function(method) {
-          var req = new Request(request, {method});
-          return c.match(req)
+          var req1 = new Request(request, {method});
+          return c.match(req1)
             .then(function(r) {
               is(typeof r, "undefined", "Searching for a request with a non-GET method should not succeed");
-              return c.match(req, {ignoreMethod: true});
+              return c.match(req1, {ignoreMethod: true});
             }).then(function(r) {
               return checkResponse(r);
             });

dom/cache/test/mochitest/test_cache_match_vary.js

@@ -1,3 +1,5 @@
+/* global context testDone:true */
+
 var requestURL = "//mochi.test:8888/tests/dom/cache/test/mochitest/vary.sjs?" + context;
 var name = "match-vary" + context;
 
@@ -36,8 +38,8 @@ function setupTestMultipleEntries(headers) {
     var response, responseText, cache;
     Promise.all(headers.map(function(h) {
       return fetch(requestURL, {headers: h});
-    })).then(function(r) {
-        response = r;
+    })).then(function(res) {
+        response = res;
         return Promise.all(response.map(function(r) {
           return r.text();
         }));
@@ -115,7 +117,6 @@ function testStar() {
         is(err.name, "TypeError", "Attempting to store a Response with a Vary:* header must fail");
       });
   }
-  var test;
   return new Promise(function(resolve, reject) {
     var cache;
     caches.open(name).then(function(c) {

dom/cache/test/mochitest/test_cache_orphaned_body.html

@@ -97,7 +97,6 @@ SpecialPowers.pushPrefEnv({
   var response = null;
   var initialUsage = 0;
   var fullUsage = 0;
-  var resetUsage = 0;
   var endUsage = 0;
   var url = "test_cache_add.js";
 

dom/cache/test/mochitest/test_cache_orphaned_cache.html

@@ -69,7 +69,6 @@ SpecialPowers.pushPrefEnv({
   var cache = null;
   var initialUsage = 0;
   var fullUsage = 0;
-  var resetUsage = 0;
   var endUsage = 0;
   var url = "test_cache_add.js";
 

dom/cache/test/mochitest/test_cache_overwrite.js

@@ -1,3 +1,5 @@
+/* global context testDone:true */
+
 var requestURL = "//mochi.test:8888/tests/dom/cache/test/mochitest/mirror.sjs?" + context;
 var response;
 var c;

dom/cache/test/mochitest/test_cache_padding.html

@@ -76,7 +76,7 @@ async function waitForIOToComplete(cache, request) {
   await cache.match(request);
 
   // Finally, wait for -wal file finish its job.
-  return await resetStorage();
+  return resetStorage();
 }
 
 function fetchOpaqueResponse(url) {

dom/cache/test/mochitest/test_cache_put.js

@@ -1,3 +1,5 @@
+/* global context testDone:true */
+
 var url = "test_cache.js";
 var cache;
 var fetchResponse;

dom/cache/test/mochitest/test_cache_put_reorder.js

@@ -1,3 +1,5 @@
+/* global context testDone:true */
+
 var name = "putreorder" + context;
 var c;
 

dom/cache/test/mochitest/test_cache_redirect.js

@@ -1,3 +1,5 @@
+/* global context testDone:true */
+
 let cache;
 let url = "foo.html";
 let redirectURL = "http://example.com/foo-bar.html";

dom/cache/test/mochitest/test_cache_requestCache.js

@@ -1,3 +1,5 @@
+/* global context testDone:true */
+
 var name = "requestCache" + context;
 var c;
 

dom/cache/test/mochitest/test_cache_updateUsage.html

@@ -76,7 +76,7 @@ async function waitForIOToComplete(cache, request) {
   await cache.match(request);
 
   // Finally, wait for -wal file finish its job.
-  return await resetStorage();
+  return resetStorage();
 }
 
 SimpleTest.waitForExplicitFinish();
@@ -137,7 +137,7 @@ SpecialPowers.pushPrefEnv({
 
   info("Stage 3.3: Verify cache.put.");
   cache = await caches.open(name);
-  response = await fetch(other_url);
+  let response = await fetch(other_url);
   await cache.put(other_url, response);
   await verifyUsage();
   info("Stage 3.3.1: Delete cache.");

dom/cache/test/mochitest/test_caches.js

@@ -1,3 +1,5 @@
+/* global context testDone:true */
+
 function arraysHaveSameContent(arr1, arr2) {
   if (arr1.length != arr2.length) {
     return false;

dom/cache/test/mochitest/worker_driver.js

@@ -39,7 +39,7 @@ function workerTestExec(script) {
       } else if (event.data.type == "status") {
         ok(event.data.status, event.data.context + ": " + event.data.msg);
       } else if (event.data.type == "getPrefs") {
-        var result = {};
+        let result = {};
         event.data.prefs.forEach(function(pref) {
           result[pref] = SpecialPowers.Services.prefs.getBoolPref(pref);
         });
@@ -49,7 +49,7 @@ function workerTestExec(script) {
           result,
         });
       } else if (event.data.type == "getPermissions") {
-        var result = {};
+        let result = {};
         event.data.permissions.forEach(function(permission) {
           result[permission] = SpecialPowers.hasPermission(permission, window.document);
         });
@@ -59,7 +59,7 @@ function workerTestExec(script) {
           result,
         });
       } else if (event.data.type == "getVersion") {
-        var result = SpecialPowers.Cc["@mozilla.org/xre/app-info;1"].getService(SpecialPowers.Ci.nsIXULAppInfo).version;
+        let result = Services.appinfo.version;
         worker.postMessage({
           type: "returnVersion",
           result,

dom/cache/test/mochitest/worker_wrapper.js

@@ -1,3 +1,5 @@
+/* eslint-env worker */
+
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/publicdomain/zero/1.0/
 //
@@ -100,12 +102,12 @@ addEventListener("message", function workerWrapperOnMessage(e) {
   function runScript() {
     try {
       importScripts(data.script);
-    } catch (e) {
+    } catch (err) {
       client.postMessage({
         type: "status",
         status: false,
         context,
-        msg: "worker failed to import " + data.script + "; error: " + e.message,
+        msg: "worker failed to import " + data.script + "; error: " + err.message,
       });
     }
   }

dom/cache/test/xpcshell/head.js

@@ -6,6 +6,8 @@
  * and are CC licensed by https://www.flickr.com/photos/legofenris/.
  */
 
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
 // services required be initialized in order to run CacheStorage
 var ss = Cc["@mozilla.org/storage/service;1"]
          .createInstance(Ci.mozIStorageService);
@@ -21,8 +23,8 @@ Cu.importGlobalProperties(["caches", "File", "fetch"]);
 function create_test_profile(zipFileName) {
   do_get_profile();
 
-  var directoryService = Cc["@mozilla.org/file/directory_service;1"]
-                         .getService(Ci.nsIProperties);
+  var directoryService = Services.dirsvc;
+
   var profileDir = directoryService.get("ProfD", Ci.nsIFile);
   var currentDir = directoryService.get("CurWorkD", Ci.nsIFile);
 
@@ -68,8 +70,7 @@ function create_test_profile(zipFileName) {
 }
 
 function getCacheDir() {
-  let dirService = Cc["@mozilla.org/file/directory_service;1"]
-                   .getService(Ci.nsIProperties);
+  let dirService = Services.dirsvc;
 
   let profileDir = dirService.get("ProfD", Ci.nsIFile);
   let cacheDir = profileDir.clone();

dom/cache/test/xpcshell/make_profile.js

@@ -6,6 +6,8 @@
  * and are CC licensed by https://www.flickr.com/photos/legofenris/.
  */
 
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
 // Enumerate the directory tree and store results in entryList as
 //
 //  { path: 'a/b/c', file: <nsIFile> }
@@ -81,8 +83,7 @@ function resetQuotaManager() {
     var qm = Cc["@mozilla.org/dom/quota/manager;1"]
              .getService(Ci.nsIQuotaManager);
 
-    var prefService = Cc["@mozilla.org/preferences-service;1"]
-                      .getService(Ci.nsIPrefService);
+    var prefService = Services.prefs;
 
     // enable quota manager testing mode
     var pref = "dom.quotaManager.testing";
@@ -100,8 +101,7 @@ function run_test() {
   do_test_pending();
   do_get_profile();
 
-  var directoryService = Cc["@mozilla.org/file/directory_service;1"]
-                         .getService(Ci.nsIProperties);
+  var directoryService = Services.dirsvc;
   var profileDir = directoryService.get("ProfD", Ci.nsIFile);
   var currentDir = directoryService.get("CurWorkD", Ci.nsIFile);