1 files changed, 15 insertions, 0 deletions
diff --git a/tools/lint/eslint/eslint-plugin-mozilla/lib/configs/browser-test.js b/tools/lint/eslint/eslint-plugin-mozilla/lib/configs/browser-test.js
index 08747a3f88..f21cd8d15a 100644
--- a/tools/lint/eslint/eslint-plugin-mozilla/lib/configs/browser-test.js
+++ b/tools/lint/eslint/eslint-plugin-mozilla/lib/configs/browser-test.js
@@ -57,6 +57,19 @@ module.exports = {
     waitForFocus: false,
   },
 
+  overrides: [
+    {
+      // Some directories have multiple kinds of tests, and some rules
+      // don't work well for plain mochitests, so disable those.
+      files: ["*.html", "*.xhtml"],
+      // plain/chrome mochitests don't automatically include Assert, so
+      // autofixing `ok()` to Assert.something is bad.
+      rules: {
+        "mozilla/no-comparison-or-assignment-inside-ok": "off",
+      },
+    },
+  ],
+
   plugins: ["mozilla", "@microsoft/sdl"],
 
   rules: {
@@ -66,6 +79,7 @@ module.exports = {
       {
         exceptions: [
           "^http:\\/\\/mochi\\.test?.*",
+          "^http:\\/\\/mochi\\.xorigin-test?.*",
           "^http:\\/\\/localhost?.*",
           "^http:\\/\\/127\\.0\\.0\\.1?.*",
           // Exempt xmlns urls
@@ -83,6 +97,7 @@ module.exports = {
     "mozilla/mark-test-function-used": "error",
     "mozilla/no-addtask-setup": "error",
     "mozilla/no-arbitrary-setTimeout": "error",
+    "mozilla/no-comparison-or-assignment-inside-ok": "error",
     "mozilla/no-redeclare-with-import-autofix": [
       "error",
       { errorForNonImports: false },