Fix --no-editorconfig option - Fix #253

yeoman · Mar 23, 2017 · 4810bef · 4810bef
1 parent 829a1fc
commit 4810bef
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/__tests__/app.js b/__tests__/app.js
@@ -138,4 +138,12 @@ describe('node:app', function () {
       });
     });
   });
+
+  describe('--no-editorconfig', function () {
+    it('include the raw files', function () {
+      return helpers.run(path.join(__dirname, '../generators/app'))
+        .withOptions({editorconfig: false})
+        .then(() => assert.noFile('.editorconfig'));
+    });
+  });
 });
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -39,6 +39,13 @@ module.exports = Generator.extend({
       desc: 'Include coveralls config'
     });
 
+    this.option('editorconfig', {
+      type: Boolean,
+      required: false,
+      default: true,
+      desc: 'Include a .editorconfig file'
+    });
+
     this.option('license', {
       type: Boolean,
       required: false,
@@ -226,9 +233,11 @@ module.exports = Generator.extend({
       this.composeWith(require.resolve('generator-travis/generators/app'), options);
     }
 
-    this.composeWith(require.resolve('../editorconfig'));
-    this.composeWith(require.resolve('../nsp'));
+    if (this.options.editorconfig) {
+      this.composeWith(require.resolve('../editorconfig'));
+    }
 
+    this.composeWith(require.resolve('../nsp'));
     this.composeWith(require.resolve('../eslint'));
 
     this.composeWith(require.resolve('../git'), {