Bug 1770727 - Fix failures of ESLint rule mozilla/use-includes-instead-of-indexOf in sjs files. r=Gijs

Depends on D147081

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

dom/media/test/allowed.sjs

@@ -8,7 +8,7 @@ function parseQuery(request, key) {
     if (p.indexOf(key + "=") == 0) {
       return p.substring(key.length + 1);
     }
-    if (p.indexOf("=") < 0 && key == "") {
+    if (!p.includes("=") && key == "") {
       return p;
     }
   }

dom/media/test/cancellable_request.sjs

@@ -8,7 +8,7 @@ function parseQuery(request, key) {
     if (p.indexOf(key + "=") == 0) {
       return p.substring(key.length + 1);
     }
-    if (p.indexOf("=") < 0 && key == "") {
+    if (!p.includes("=") && key == "") {
       return p;
     }
   }

dom/media/test/contentType.sjs

@@ -10,7 +10,7 @@ function parseQuery(request, key) {
     if (p.indexOf(key + "=") == 0) {
       return p.substring(key.length + 1);
     }
-    if (p.indexOf("=") < 0 && key == "") {
+    if (!p.includes("=") && key == "") {
       return p;
     }
   }

dom/media/test/dash_detect_stream_switch.sjs

@@ -27,7 +27,7 @@ function parseQuery(request, key) {
     if (p.indexOf(key + "=") === 0) {
       return p.substring(key.length + 1);
     }
-    if (p.indexOf("=") < 0 && key === "") {
+    if (!p.includes("=") && key === "") {
       return p;
     }
   }

dom/media/test/dynamic_resource.sjs

@@ -8,7 +8,7 @@ function parseQuery(request, key) {
     if (p.indexOf(key + "=") == 0) {
       return p.substring(key.length + 1);
     }
-    if (p.indexOf("=") < 0 && key == "") {
+    if (!p.includes("=") && key == "") {
       return p;
     }
   }

dom/media/test/redirect.sjs

@@ -8,7 +8,7 @@ function parseQuery(request, key) {
     if (p.indexOf(key + "=") == 0) {
       return p.substring(key.length + 1);
     }
-    if (p.indexOf("=") < 0 && key == "") {
+    if (!p.includes("=") && key == "") {
       return p;
     }
   }

dom/media/test/referer.sjs

@@ -8,7 +8,7 @@ function parseQuery(request, key) {
     if (p.indexOf(key + "=") == 0) {
       return p.substring(key.length + 1);
     }
-    if (p.indexOf("=") < 0 && key == "") {
+    if (!p.includes("=") && key == "") {
       return p;
     }
   }

dom/security/test/https-first/file_upgrade_insecure_server.sjs

@@ -55,7 +55,7 @@ function handleRequest(request, response) {
   }
 
   // just in case error handling for unexpected queries
-  if (expectedQueries.indexOf(queryString) == -1) {
+  if (!expectedQueries.includes(queryString)) {
     response.write("unexpected-response");
     return;
   }

dom/security/test/https-only/file_upgrade_insecure_server.sjs

@@ -54,7 +54,7 @@ function handleRequest(request, response) {
   }
 
   // just in case error handling for unexpected queries
-  if (expectedQueries.indexOf(queryString) == -1) {
+  if (!expectedQueries.includes(queryString)) {
     response.write("unexpected-response");
     return;
   }

dom/xhr/tests/file_XHRSendData.sjs

@@ -24,7 +24,7 @@ function handleRequest(request, response) {
 
   var data = String.fromCharCode.apply(null, bytes);
   response.setHeader("Result-Content-Length", "" + data.length);
-  if (data.indexOf("TEST_REDIRECT_STR") >= 0) {
+  if (data.includes("TEST_REDIRECT_STR")) {
     var newURL = "http://" + data.split("&url=")[1];
     response.setStatusLine(null, 307, "redirect");
     response.setHeader("Location", newURL, false);

dom/xhr/tests/file_html_in_xhr.sjs

@@ -1,6 +1,6 @@
 function handleRequest(request, response) {
   response.setHeader("Content-Type", "text/javascript", false);
-  if (request.queryString.indexOf("report") != -1) {
+  if (request.queryString.includes("report")) {
     if (getState("loaded") == "loaded") {
       response.write(
         "ok(false, 'This script was not supposed to get fetched.'); continueAfterReport();"

editor/libeditor/tests/file_sanitizer_on_paste.sjs

@@ -1,5 +1,5 @@
 function handleRequest(request, response) {
-  if (request.queryString.indexOf("report") != -1) {
+  if (request.queryString.includes("report")) {
     response.setHeader("Content-Type", "text/javascript", false);
     if (getState("loaded") == "loaded") {
       response.write(

parser/htmlparser/tests/mochitest/dir_bug534293/file_bug534293.sjs

@@ -1,6 +1,6 @@
 function handleRequest(request, response) {
   response.setHeader("Content-Type", "text/javascript", false);
-  if (request.queryString.indexOf("report") != -1) {
+  if (request.queryString.includes("report")) {
     if (getState("loaded") == "loaded") {
       response.write("ok(true, 'This script was supposed to get fetched.');");
     } else {

parser/htmlparser/tests/mochitest/file_bug102699.sjs

@@ -1,6 +1,6 @@
 function handleRequest(request, response) {
   response.setHeader("Content-Type", "text/javascript", false);
-  if (request.queryString.indexOf("report") != -1) {
+  if (request.queryString.includes("report")) {
     if (getState("loaded") == "loaded") {
       response.write(
         "ok(false, 'This script was not supposed to get fetched.'); continueAfterReport();"

parser/htmlparser/tests/mochitest/file_bug534293.sjs

@@ -1,6 +1,6 @@
 function handleRequest(request, response) {
   response.setHeader("Content-Type", "text/javascript", false);
-  if (request.queryString.indexOf("report") != -1) {
+  if (request.queryString.includes("report")) {
     if (getState("loaded") == "loaded") {
       response.write(
         "ok(false, 'This script was not supposed to get fetched.');"

parser/htmlparser/tests/mochitest/file_bug543062.sjs

@@ -24,11 +24,11 @@ function armTimer(response) {
 function handleRequest(request, response) {
   response.setHeader("Cache-Control", "no-cache", false);
   response.setHeader("Content-Type", "text/javascript", false);
-  if (request.queryString.indexOf("first") != -1) {
+  if (request.queryString.includes("first")) {
     response.write("// first\n");
     response.processAsync();
     armTimer(response);
-  } else if (request.queryString.indexOf("second") != -1) {
+  } else if (request.queryString.includes("second")) {
     response.write("// second\n");
     setState("docwritepreloadssecond", "second");
   } else {

parser/htmlparser/tests/mochitest/file_bug642908.sjs

@@ -1,5 +1,5 @@
 function handleRequest(request, response) {
-  if (request.queryString.indexOf("report") != -1) {
+  if (request.queryString.includes("report")) {
     response.setHeader("Content-Type", "text/javascript", false);
     if (getState("loaded") == "loaded") {
       response.write(

parser/htmlparser/tests/mochitest/file_bug655682.sjs

@@ -2,7 +2,7 @@ var timer;
 var callback;
 
 function handleRequest(request, response) {
-  if (request.queryString.indexOf("trigger") != -1) {
+  if (request.queryString.includes("trigger")) {
     setState("triggered", "triggered");
     response.setHeader("Cache-Control", "no-cache", false);
     response.setHeader("Content-Type", "text/javascript; charset=utf-8", false);

toolkit/components/thumbnails/test/thumbnails_background.sjs

@@ -46,7 +46,7 @@ function handleRequest(req, resp) {
     req
       .getHeader("Cookie")
       .split(";")
-      .indexOf("red") >= 0
+      .includes("red")
   ) {
     resp.write(
       '<html style="background: #f00;">' + setCookieScript + "</html>"
@@ -60,7 +60,7 @@ function handleRequest(req, resp) {
     req
       .getHeader("Cookie")
       .split(";")
-      .indexOf("green") >= 0
+      .includes("green")
   ) {
     resp.write(
       '<html style="background: #0f0;">' + setCookieScript + "</html>"

toolkit/components/url-classifier/tests/mochitest/cache.sjs

@@ -32,7 +32,7 @@ function handleRequest(request, response) {
     setState(list, hashes);
 
     let lists = getState("lists");
-    if (lists.indexOf(list) == -1) {
+    if (!lists.includes(list)) {
       lists += list + "\n";
       setState("lists", lists);
     }

toolkit/components/url-classifier/tests/mochitest/gethash.sjs

@@ -28,7 +28,7 @@ function handleRequest(request, response) {
     setState(list, hashes);
 
     let lists = getState("lists");
-    if (lists.indexOf(list) == -1) {
+    if (!lists.includes(list)) {
       lists += list + "\n";
       setState("lists", lists);
     }

toolkit/components/url-classifier/tests/mochitest/update.sjs

@@ -26,7 +26,7 @@ function handleRequest(request, response) {
     setState(list, hashes);
 
     let lists = getState("lists");
-    if (lists.indexOf(list) == -1) {
+    if (!lists.includes(list)) {
       lists += list + "\n";
       setState("lists", lists);
     }