QUA-146: Fix no rules configured warning (#509) (#510)

* QUA-146: Avoid warning due to file without rules * QUA-146: Avoid checking condition in each iteration
codeclimate · Dec 17, 2020 · f2791e8 · f2791e8
1 parent e15fc91
commit f2791e8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 52 deletions.
diff --git a/integration/eslint_test.js b/integration/eslint_test.js
@@ -43,17 +43,6 @@ describe("eslint integration", function() {
   })
 
   describe("validating config", function() {
-    it("warns about empty config but not raise error", function() {
-      function executeEmptyConfig() {
-        executeConfig("empty_config/config.json")
-      }
-
-      expect(executeEmptyConfig).to.not.throw()
-      expect(consoleMock.outputErr).to.include(
-        "No rules are configured. Make sure you have added a config file with rules enabled."
-      )
-    })
-
     it("raise on file not found", function() {
       function executeNoLintrc() {
         executeConfig("no_lintrc/config.json")

diff --git a/lib/eslint6-patch.js b/lib/eslint6-patch.js
@@ -34,21 +34,6 @@ module.exports = function patch() {
     }
   }
 
-  function configWithRules(config) {
-    if (config.rules) {
-      return config
-    }
-
-    console.error(
-      "No rules are configured. Make sure you have added a config file with rules enabled."
-    )
-    console.error(
-      "See our documentation at https://docs.codeclimate.com/docs/eslint for more information."
-    )
-
-    return false
-  }
-
   function patchPluginLoading() {
     const methods = [
       "_loadExtendedPluginConfig",
@@ -84,39 +69,34 @@ module.exports = function patch() {
     })
   }
 
-  function patchConfigs() {
-    const originalLoadConfigData = ConfigArrayFactory.prototype._loadConfigData
-    ConfigArrayFactory.prototype._loadConfigData = function _loadConfigData() {
-      const results = originalLoadConfigData.apply(this, arguments)
-      return [...results].filter(configWithRules)
-    }
-  }
-
   function patchConfigArray() {
     const orig = ConfigArray.prototype.extractConfig
     ConfigArray.prototype.extractConfig = function extractConfig() {
       const config = orig.apply(this, arguments)
 
-      RULES_BLOCKLIST.forEach((ruleName) => {
-        if (config.rules[ruleName] !== "off") {
-          config.rules[ruleName] = "off"
-          disabledRules.add(ruleName)
-        }
-      })
+      if (config.rules) {
+        RULES_BLOCKLIST.forEach((ruleName) => {
+          if (config.rules[ruleName] !== "off") {
+            config.rules[ruleName] = "off"
+            disabledRules.add(ruleName)
+          }
+        })
+      }
 
-      SETTINGS_BLOCKLIST.forEach((settingName) => {
-        if (config.settings && config.settings[settingName]) {
-          delete config.settings[settingName]
-          removedSettings.add(settingName)
-        }
-      })
+      if (config.settings) {
+        SETTINGS_BLOCKLIST.forEach((settingName) => {
+          if (config.settings[settingName]) {
+            delete config.settings[settingName]
+            removedSettings.add(settingName)
+          }
+        })
+      }
 
       return config
     }
   }
 
   patchPluginLoading()
-  patchConfigs()
   patchConfigArray()
 
   return {

diff --git a/test/eslint6-patch_test.js b/test/eslint6-patch_test.js
@@ -2,6 +2,7 @@ const expect = require("chai").expect
 const sinon = require("sinon")
 
 const { ConfigArrayFactory } = require("eslint/lib/cli-engine/config-array-factory")
+const { ConfigArray } = require("eslint/lib/cli-engine/config-array")
 
 const eslintPatch = require("../lib/eslint6-patch")
 
@@ -11,11 +12,11 @@ const eslintPatch = require("../lib/eslint6-patch")
  */
 describe("eslint6-patch", function() {
   describe("patch", function() {
-    let originalLoadPlugin, originalLoadConfigData
+    let originalLoadPlugin, originalExtractConfig
 
     before(function() {
       originalLoadPlugin = ConfigArrayFactory.prototype._loadPlugin
-      originalLoadConfigData = ConfigArrayFactory.prototype._loadConfigData
+      originalExtractConfig = ConfigArray.prototype.extractConfig
     })
 
     it("intercepts plugin loading", function() {
@@ -28,9 +29,9 @@ describe("eslint6-patch", function() {
 
     it("intercepts rule configs", function() {
       eslintPatch()
-      expect(originalLoadConfigData).to.not.equal(
-        ConfigArrayFactory.prototype._loadConfigData,
-        "ConfigArrayFactory._loadConfigData is not patched"
+      expect(originalExtractConfig).to.not.equal(
+        ConfigArray.prototype.extractConfig,
+        "ConfigArray.prototype.extractConfig is not patched"
       )
     })
   })