Merge 052ca0c into 87c5daf

jscs-dev · Mar 18, 2016 · abf08fc · abf08fc
2 parents 87c5daf + 052ca0c
commit abf08fc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/config/generator.js b/lib/config/generator.js
@@ -168,7 +168,7 @@ Generator.prototype._handleViolatedRules = function(errorPrompts, choices) {
     errorPrompts.forEach(function(errorPrompt) {
         var userChoice = choices[errorPrompt.name];
 
-        if (userChoice.toLowerCase() === 'e') {
+        if (userChoice && userChoice.toLowerCase() === 'e') {
             this._config[errorPrompt.associatedRuleName] = null;
         }
     }, this);

diff --git a/test/specs/config/generator.js b/test/specs/config/generator.js
@@ -9,7 +9,9 @@ var Configuration = require('../../../lib/config/configuration');
 var ConfigGenerator = require('../../../lib/config/generator');
 var crockfordClone = require('../../data/configs/generator/crockfordClone');
 
-describe.skip('lib/config/generator', function() {
+describe('lib/config/generator', function() {
+    this.timeout(60000);
+
     var _path = path.resolve(__dirname, '../../../lib/config/generator.js');
     var crockfordPresetChoice;