From 8346839a9e2a98d484b2ee7437a2d41349394dea Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Mon, 10 Feb 2020 16:28:09 +0000
Subject: [PATCH] Bug 1613903 - Enable ESLint for testing/marionette/harness
 and testing/marionette/legacyaction.js (manual changes).
 r=whimboo,marionette-reviewers

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

--HG--
extra : moz-landing-system : lando
---
 .eslintignore                                 | 12 +++--------
 .../marionette_harness/www/deletingFrame.html |  1 +
 .../www/html5/geolocation.js                  |  2 ++
 .../marionette_harness/www/html5Page.html     |  3 ++-
 .../marionette_harness/www/keyboard.html      |  2 +-
 .../harness/marionette_harness/www/shim.js    |  8 +++++---
 .../marionette_harness/www/testAction.html    | 10 ++++++----
 .../marionette_harness/www/test_dynamic.html  |  2 +-
 .../www/test_shadow_dom.html                  |  8 ++++----
 .../www/test_tab_modal_dialogs.html           |  1 +
 testing/marionette/legacyaction.js            | 20 ++++++++++---------
 11 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 16c1fdbe5434..3a4834884ab8 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -178,19 +178,13 @@ services/fxaccounts/FxAccountsPairingChannel.js
 # Servo is imported.
 servo/
 
-# Remote protocol exclusions
-testing/marionette/atom.js
-testing/marionette/legacyaction.js
-testing/marionette/harness
-
-# other testing/ exclusions
 # third party modules
 testing/mochitest/tests/Harness_sanity/
 testing/mochitest/tests/SimpleTest/
-# octothorpe used for pref file comment causes parsing error
-testing/mozbase/mozprofile/tests/files/prefs_with_comments.js
 
-# Test files that we don't want to lint.
+# Test files that we don't want to lint (preprocessed, minified etc)
+testing/marionette/atom.js
+testing/mozbase/mozprofile/tests/files/prefs_with_comments.js
 testing/talos/talos/scripts/jszip.min.js
 testing/talos/talos/startup_test/sessionrestore/profile/sessionstore.js
 testing/talos/talos/startup_test/sessionrestore/profile-manywindows/sessionstore.js
diff --git a/testing/marionette/harness/marionette_harness/www/deletingFrame.html b/testing/marionette/harness/marionette_harness/www/deletingFrame.html
index dec7cd402e71..af226e959539 100644
--- a/testing/marionette/harness/marionette_harness/www/deletingFrame.html
+++ b/testing/marionette/harness/marionette_harness/www/deletingFrame.html
@@ -11,6 +11,7 @@
             function addBack() {
                 let iframe = '<iframe src="formPage.html" marginheight="0" marginwidth="0" topmargin="0" leftmargin="600" allowtransparency="true" frameborder="0" height="600" scrolling="no" width="120" id="iframe1"></iframe>';
                 let myDiv2 = document.getElementById("myDiv2");
+                // eslint-disable-next-line no-unsanitized/property
                 myDiv2.innerHTML = iframe;
             }
         </script>
diff --git a/testing/marionette/harness/marionette_harness/www/html5/geolocation.js b/testing/marionette/harness/marionette_harness/www/html5/geolocation.js
index 91ab4d1b5c1f..4fb4a4747b4c 100644
--- a/testing/marionette/harness/marionette_harness/www/html5/geolocation.js
+++ b/testing/marionette/harness/marionette_harness/www/html5/geolocation.js
@@ -1,3 +1,5 @@
+/* eslint-disable no-unsanitized/property */
+
 function success(position) {
   let message = document.getElementById("status");
   message.innerHTML =
diff --git a/testing/marionette/harness/marionette_harness/www/html5Page.html b/testing/marionette/harness/marionette_harness/www/html5Page.html
index 4197cd12269d..fbd943d79252 100644
--- a/testing/marionette/harness/marionette_harness/www/html5Page.html
+++ b/testing/marionette/harness/marionette_harness/www/html5Page.html
@@ -29,9 +29,10 @@ limitations under the License.
 <div id="images">
   <p>Current network status: <span id="state"></span></p>
   <script>
-    var state = document.getElementById('state')
+    const state = document.getElementById('state')
     setInterval(function () {
       state.className = navigator.onLine ? 'online' : 'offline';
+      // eslint-disable-next-line no-unsanitized/property
       state.innerHTML = navigator.onLine ? 'online' : 'offline';
     }, 250);
   </script>
diff --git a/testing/marionette/harness/marionette_harness/www/keyboard.html b/testing/marionette/harness/marionette_harness/www/keyboard.html
index 1a71b3a4b980..e711b31e057c 100644
--- a/testing/marionette/harness/marionette_harness/www/keyboard.html
+++ b/testing/marionette/harness/marionette_harness/www/keyboard.html
@@ -8,7 +8,7 @@
   <title>Testing Javascript</title>
   <meta name="viewport" content="user-scalable=no">
   <script type="text/javascript">
-    var seen = {};
+    const seen = {};
 
     function updateResult(event) {
       document.getElementById('result').innerText = event.target.value;
diff --git a/testing/marionette/harness/marionette_harness/www/shim.js b/testing/marionette/harness/marionette_harness/www/shim.js
index dd5b9cb93fd3..c30433308820 100644
--- a/testing/marionette/harness/marionette_harness/www/shim.js
+++ b/testing/marionette/harness/marionette_harness/www/shim.js
@@ -165,14 +165,16 @@
       let tracking =
         MouseEventShim.trackMouseMoves && !MouseEventShim.capturing;
 
+      let oldtarget;
+      let newtarget;
       if (tracking) {
         // If the touch point moves, then the element it is over
         // may have changed as well. Note that calling elementFromPoint()
         // forces a layout if one is needed.
         // XXX: how expensive is it to do this on each touchmove?
         // Can we listen for (non-standard) touchleave events instead?
-        var oldtarget = target;
-        var newtarget = document.elementFromPoint(touch.clientX, touch.clientY);
+        oldtarget = target;
+        newtarget = document.elementFromPoint(touch.clientX, touch.clientY);
         if (newtarget === null) {
           // this can happen as the touch is moving off of the screen, e.g.
           newtarget = oldtarget;
@@ -256,7 +258,7 @@
   }
 })();
 
-var MouseEventShim = {
+const MouseEventShim = {
   // It is a known gecko bug that synthetic events have timestamps measured
   // in microseconds while regular events have timestamps measured in
   // milliseconds. This utility function returns a the timestamp converted
diff --git a/testing/marionette/harness/marionette_harness/www/testAction.html b/testing/marionette/harness/marionette_harness/www/testAction.html
index aa52683915bd..404ce9809a87 100644
--- a/testing/marionette/harness/marionette_harness/www/testAction.html
+++ b/testing/marionette/harness/marionette_harness/www/testAction.html
@@ -19,8 +19,8 @@
   <h2 id="hidden" style="visibility: hidden" class="linkClass">Hidden</h2>
   <button id="buttonFlick" style="position:absolute;left:0px;top:255px;" type="button" allowevents=true>buttonFlick</button>
   <script type="text/javascript">
-    var button3Timer = null;
-    var button4Timer = null;
+    let button3Timer = null;
+    let button4Timer = null;
     //appends passed in text to the innerHTML of the event's target
     function appendText(text) {
       return function(evt) {
@@ -31,7 +31,7 @@
            }
            else {
              //since the target of touchstart is the target of all subsequent events, then
-             //changedTouches holds the current coordinates of this touch event, so we 
+             //changedTouches holds the current coordinates of this touch event, so we
              //use these coordinates to find the element under the touch event
              let touches = evt.changedTouches;
              let x = touches[0].clientX;
@@ -43,6 +43,7 @@
          else {
           element = evt.target;
          }
+         // eslint-disable-next-line no-unsanitized/property
          element.innerHTML += text;
       };
     };
@@ -66,6 +67,7 @@
     function addTimers(id, timer) {
       let element = document.getElementById(id);
       element.addEventListener("touchstart", function(evt) { timer = (new Date()).getTime();});
+      // eslint-disable-next-line no-unsanitized/property
       element.addEventListener("touchend", function(evt) { timer = (new Date()).getTime() - timer; evt.target.innerHTML += "-" + timer;});
     }
     attachListeners("button1");
@@ -75,7 +77,7 @@
     attachListeners("buttonScroll");
     addTimers("button3");
     addTimers("button4");
-    var buttonFlick = document.getElementById("buttonFlick");
+    const buttonFlick = document.getElementById("buttonFlick");
     attachMouseListeners(buttonFlick);
     function createDelayed() {
       let newButton = document.createElement("button");
diff --git a/testing/marionette/harness/marionette_harness/www/test_dynamic.html b/testing/marionette/harness/marionette_harness/www/test_dynamic.html
index bc43d138407b..504e7e74ba47 100644
--- a/testing/marionette/harness/marionette_harness/www/test_dynamic.html
+++ b/testing/marionette/harness/marionette_harness/www/test_dynamic.html
@@ -4,7 +4,7 @@
   <head>
     <title></title>
     <script type="text/javascript">
-      var next = 0;
+      let next = 0;
 
       function addMore() {
         let box = document.createElement('DIV');
diff --git a/testing/marionette/harness/marionette_harness/www/test_shadow_dom.html b/testing/marionette/harness/marionette_harness/www/test_shadow_dom.html
index 0c7ebd264435..9947178c7532 100644
--- a/testing/marionette/harness/marionette_harness/www/test_shadow_dom.html
+++ b/testing/marionette/harness/marionette_harness/www/test_shadow_dom.html
@@ -14,12 +14,12 @@
   <div id="empty-host"></div>
   <script>
     'use strict';
-    var host = document.getElementById('host');
-    var root = host.attachShadow({ mode: "open" });
+    const host = document.getElementById('host');
+    const root = host.attachShadow({ mode: "open" });
     root.innerHTML = '<button id="button">Foo</button>' +
       '<div id="inner-host"></div>';
-    var innerHost = host.shadowRoot.getElementById('inner-host');
-    var innerRoot = innerHost.attachShadow({ mode: "open" });
+    const innerHost = host.shadowRoot.getElementById('inner-host');
+    const innerRoot = innerHost.attachShadow({ mode: "open" });
     innerRoot.innerHTML = '<button id="inner-button">Bar</button>';
   </script>
 </body>
diff --git a/testing/marionette/harness/marionette_harness/www/test_tab_modal_dialogs.html b/testing/marionette/harness/marionette_harness/www/test_tab_modal_dialogs.html
index 155a36d70f17..b61bda5608aa 100644
--- a/testing/marionette/harness/marionette_harness/www/test_tab_modal_dialogs.html
+++ b/testing/marionette/harness/marionette_harness/www/test_tab_modal_dialogs.html
@@ -8,6 +8,7 @@
   <title>Dialog Test</title>
   <script type="text/javascript">
     function setInnerText(id, value) {
+      // eslint-disable-next-line no-unsanitized/property
       document.getElementById(id).innerHTML = "<p>" + value + "</p>";
     }
 
diff --git a/testing/marionette/legacyaction.js b/testing/marionette/legacyaction.js
index 1c1521408372..bb6865c7af21 100644
--- a/testing/marionette/legacyaction.js
+++ b/testing/marionette/legacyaction.js
@@ -8,7 +8,9 @@ const { Preferences } = ChromeUtils.import(
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
-
+const { WebDriverError } = ChromeUtils.import(
+  "chrome://marionette/content/error.js"
+);
 const { element, WebElement } = ChromeUtils.import(
   "chrome://marionette/content/element.js"
 );
@@ -25,6 +27,7 @@ const DEFAULT_CONTEXT_MENU_DELAY = 750; // ms
 
 this.EXPORTED_SYMBOLS = ["legacyaction"];
 
+/* global action */
 /** @namespace */
 this.legacyaction = this.action = {};
 
@@ -387,6 +390,7 @@ action.Chain.prototype.generateEvents = function(
   switch (type) {
     case "tap":
       if (this.mouseEventsOnly) {
+        let touch = this.touchProvider.createATouch(target, x, y, touchId);
         this.mouseTap(
           touch.target.ownerDocument,
           touch.clientX,
@@ -497,14 +501,11 @@ action.Chain.prototype.generateEvents = function(
         target = this.touchIds[touchId].target;
       }
 
-      let [
-        clientX,
-        clientY,
-        pageX,
-        pageY,
-        screenX,
-        screenY,
-      ] = this.getCoordinateInfo(target, x, y);
+      let [clientX, clientY, , , screenX, screenY] = this.getCoordinateInfo(
+        target,
+        x,
+        y
+      );
 
       event.initMouseEvent(
         "contextmenu",
@@ -529,6 +530,7 @@ action.Chain.prototype.generateEvents = function(
     default:
       throw new WebDriverError("Unknown event type: " + type);
   }
+  return null;
 };
 
 action.Chain.prototype.mouseTap = function(doc, x, y, button, count, mod) {