Configuration: allow default preset override

Author: markelog

lib/config/configuration.js

@@ -7,6 +7,8 @@ var defaults = {
     maxErrors: 50
 };
 
+var _ = require('lodash');
+
 var BUILTIN_OPTIONS = {
     plugins: true,
     preset: true,
@@ -882,6 +884,8 @@ Configuration.prototype.getRegisteredRules = function() {
  * @param {Object} presetConfig
  */
 Configuration.prototype.registerPreset = function(presetName, presetConfig) {
+    assert(_.isPlainObject(presetConfig), 'Preset should be an object');
+
     this._presets[presetName] = presetConfig;
 };
 

lib/config/node-configuration.js

@@ -146,21 +146,21 @@ NodeConfiguration.prototype._loadPlugin = function(plugin, config) {
  * @protected
  */
 NodeConfiguration.prototype._loadPreset = function(preset, config) {
-    var registeredPresets = this.getRegisteredPresets();
+    var name = path.basename(preset).split('.')[0];
 
-    if (preset in registeredPresets) {
-        Configuration.prototype._loadPreset.call(this, preset);
+    try {
+        this.registerPreset(name, this.loadExternal(preset, 'preset', config));
+    } catch (e) {
+        var registeredPresets = this.getRegisteredPresets();
 
-    } else {
-        var name = path.basename(preset).split('.')[0];
-
-        // Suppress it, since missing preset error will be handled by the caller
-        try {
-            this.registerPreset(name, this.loadExternal(preset, 'preset', config));
-        } catch (e) {}
-
-        Configuration.prototype._loadPreset.call(this, name);
+        if (preset in registeredPresets) {
+            Configuration.prototype._loadPreset.call(this, preset);
+            return;
+        }
     }
+
+    // If preset is an external module, error will be thrown by the caller
+    Configuration.prototype._loadPreset.call(this, name);
 };
 
 /**

test/data/configs/modules/node_modules/jscs-preset-wikimedia/index.json

@@ -236,6 +236,14 @@ describe('config/configuration', function() {
         });
     });
 
+    describe('registerPreset', function() {
+        it('should throw if preset is not an object', function() {
+            expect(
+                configuration.registerPreset.bind(configuration, 'test', undefined)
+            ).to.throw('Preset should be an object')
+        });
+    });
+
     describe('getFix', function() {
         it('should enable "fix" option', function() {
             configuration.load({ fix: true });
@@ -486,6 +494,16 @@ describe('config/configuration', function() {
             expect(configuration.getProcessedConfig().preset).to.equal('2');
         });
 
+        it('should override default preset', function() {
+            configuration.registerDefaultRules();
+            configuration.registerDefaultPresets();
+            configuration.registerPreset('wikimedia', {});
+
+            configuration.load({preset: 'wikimedia'});
+
+            expect(configuration.getConfiguredRules().length).to.equal(0);
+        });
+
         it('should override `maxErrors` setting', function() {
             configuration.override({maxErrors: 2});
             configuration.load({maxErrors: 1});

test/data/configs/modules/node_modules/jscs-preset-wikimedia/package.json

@@ -37,10 +37,12 @@ describe('modules/config/node-configuration', function() {
         });
 
         it('should load absolute path', function() {
-            expect(configuration.loadExternal(
+            expect(
+                configuration.loadExternal(
                     path.resolve('./test/data/plugin/plugin'),
                     'plugin'
-                )).to.be.a('function');
+                )
+            ).to.be.a('function');
         });
 
         it('should load without "jscs" prefix node module', function() {
@@ -71,6 +73,24 @@ describe('modules/config/node-configuration', function() {
             stub.restore();
         });
 
+        it('should override default preset with module preset', function() {
+            var way = path.resolve('./test/data/configs/modules');
+            var stub = sinon.stub(process, 'cwd');
+
+            stub.returns(way);
+
+            configuration = new NodeConfiguration();
+
+            configuration.registerDefaultRules();
+            configuration.registerDefaultPresets();
+            configuration.load({
+                preset: 'wikimedia'
+            });
+            stub.restore();
+
+            expect(configuration.getConfiguredRules().length).to.equal(0);
+        });
+
         it('should load preset with "jscs-config" prefix without cwd', function() {
             var config = path.resolve('./test/data/configs/modules/config.json');