Merge pull request #1122 from mythmon/backports

Backport changes from mozilla-central

recipe-client-addon/lib/Sampling.jsm

@@ -10,7 +10,7 @@ Cu.importGlobalProperties(["crypto", "TextEncoder"]);
 this.EXPORTED_SYMBOLS = ["Sampling"];
 
 const hashBits = 48;
-const hashLength = hashBits / 4;  // each hexadecimal digit represents 4 bits
+const hashLength = hashBits / 4; // each hexadecimal digit represents 4 bits
 const hashMultiplier = Math.pow(2, hashBits) - 1;
 
 this.Sampling = {

recipe-client-addon/test/browser/browser_about_preferences.js

@@ -1,5 +1,7 @@
 "use strict";
 
+/* eslint-disable mozilla/no-cpows-in-tests */
+
 Cu.import("resource://gre/modules/Services.jsm", this);
 
 const OPT_OUT_PREF = "app.shield.optoutstudies.enabled";

recipe-client-addon/test/browser/browser_about_studies.js

@@ -14,6 +14,7 @@ function withAboutStudies(testFunc) {
 decorate_task(
   withAboutStudies,
   async function testAboutStudiesWorks(browser) {
+    // eslint-disable-next-line mozilla/no-cpows-in-tests
     ok(browser.contentDocument.getElementById("app"), "App element was found");
   }
 );
@@ -50,11 +51,13 @@ decorate_task(
       });
     });
 
+    /* eslint-disable mozilla/no-cpows-in-tests */
     if (gBrowser.contentDocument.readyState !== "complete") {
       await BrowserTestUtils.waitForEvent(gBrowser.contentWindow, "load");
     }
 
     const location = gBrowser.contentWindow.location.href;
+    /* eslint-enable mozilla/no-cpows-in-tests */
     is(
       location,
       "about:preferences#privacy",