CLI: do not keep adding preset from CLI

Fixes #2087
jscs-dev · Jan 24, 2016 · 72f9cb5 · 72f9cb5
1 parent 787e80e
commit 72f9cb5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/lib/config/configuration.js b/lib/config/configuration.js
@@ -733,6 +733,9 @@ Configuration.prototype._loadPreset = function(preset) {
         return;
     }
 
+    // Do not keep adding preset from CLI (#2087)
+    delete this._overrides.preset;
+
     this._loadedPresets.push(preset);
 
     // If preset is loaded from another preset - preserve the original name

diff --git a/test/specs/config/node-configuration.js b/test/specs/config/node-configuration.js
@@ -175,6 +175,18 @@ describe('modules/config/node-configuration', function() {
 
             expect(configuration.getFileExtensions()).to.deep.equal(['.js']);
         });
+
+        it('should not make a conflict between overrides and preset (#2087)', function() {
+            configuration.registerPreset('jquery', {});
+
+            configuration.overrideFromCLI({
+                preset: 'jquery'
+            });
+
+            configuration.load({});
+
+            expect(configuration.getFileExtensions()).to.deep.equal(['.js']);
+        });
     });
 
     describe('load', function() {