feature(generate): configure spec generation at the project level (angular#2475)

Brocco · web-flow · commit 3a3feaf7a1eb · 2016-10-03T11:48:27.000-04:00
Fixes angular#2448
diff --git a/packages/angular-cli/blueprints/class/index.js b/packages/angular-cli/blueprints/class/index.js
@@ -11,7 +11,7 @@ module.exports = {
   ],
 
   availableOptions: [
-    { name: 'spec', type: Boolean, default: true }
+    { name: 'spec', type: Boolean }
   ],
 
   normalizeEntityName: function (entityName) {
@@ -27,6 +27,11 @@ module.exports = {
     if (classType) {
       this.fileName += '.' + classType;
     }
+
+    options.spec = options.spec !== undefined ?
+      options.spec :
+      this.project.ngConfigObj.get('defaults.spec.class');
+
     return {
       dynamicPath: this.dynamicPath.dir,
       flat: options.flat,
diff --git a/packages/angular-cli/blueprints/component/index.js b/packages/angular-cli/blueprints/component/index.js
@@ -16,7 +16,7 @@ module.exports = {
     { name: 'inline-template', type: Boolean, aliases: ['it'] },
     { name: 'inline-style', type: Boolean, aliases: ['is'] },
     { name: 'prefix', type: Boolean, default: true },
-    { name: 'spec', type: Boolean, default: true }
+    { name: 'spec', type: Boolean }
   ],
 
   beforeInstall: function() {
@@ -64,6 +64,10 @@ module.exports = {
       options.inlineTemplate :
       this.project.ngConfigObj.get('defaults.inline.template');
 
+    options.spec = options.spec !== undefined ?
+      options.spec :
+      this.project.ngConfigObj.get('defaults.spec.component');
+
     return {
       dynamicPath: this.dynamicPath.dir.replace(this.dynamicPath.appRoot, ''),
       flat: options.flat,
diff --git a/packages/angular-cli/blueprints/directive/index.js b/packages/angular-cli/blueprints/directive/index.js
@@ -13,7 +13,7 @@ module.exports = {
   availableOptions: [
     { name: 'flat', type: Boolean, default: true },
     { name: 'prefix', type: Boolean, default: true },
-    { name: 'spec', type: Boolean, default: true }
+    { name: 'spec', type: Boolean }
   ],
 
   beforeInstall: function() {
@@ -42,6 +42,10 @@ module.exports = {
   },
 
   locals: function (options) {
+    options.spec = options.spec !== undefined ?
+      options.spec :
+      this.project.ngConfigObj.get('defaults.spec.directive');
+
     return {
       dynamicPath: this.dynamicPath.dir,
       flat: options.flat,
diff --git a/packages/angular-cli/blueprints/module/index.js b/packages/angular-cli/blueprints/module/index.js
@@ -7,7 +7,7 @@ module.exports = {
   description: '',
 
   availableOptions: [
-    { name: 'spec', type: Boolean, default: false },
+    { name: 'spec', type: Boolean },
     { name: 'routing', type: Boolean, default: false }
   ],
 
@@ -20,6 +20,10 @@ module.exports = {
   },
 
   locals: function (options) {
+    options.spec = options.spec !== undefined ?
+      options.spec :
+      this.project.ngConfigObj.get('defaults.spec.module');
+
     return {
       dynamicPath: this.dynamicPath.dir,
       spec: options.spec,
diff --git a/packages/angular-cli/blueprints/pipe/index.js b/packages/angular-cli/blueprints/pipe/index.js
@@ -12,7 +12,7 @@ module.exports = {
 
   availableOptions: [
     { name: 'flat', type: Boolean, default: true },
-    { name: 'spec', type: Boolean, default: true }
+    { name: 'spec', type: Boolean }
   ],
 
   beforeInstall: function() {
@@ -31,6 +31,10 @@ module.exports = {
   },
 
   locals: function (options) {
+    options.spec = options.spec !== undefined ?
+      options.spec :
+      this.project.ngConfigObj.get('defaults.spec.pipe');
+
     return {
       dynamicPath: this.dynamicPath.dir,
       flat: options.flat
diff --git a/packages/angular-cli/blueprints/service/index.js b/packages/angular-cli/blueprints/service/index.js
@@ -9,7 +9,7 @@ module.exports = {
 
   availableOptions: [
     { name: 'flat', type: Boolean, default: true },
-    { name: 'spec', type: Boolean, default: true }
+    { name: 'spec', type: Boolean }
   ],
 
   normalizeEntityName: function (entityName) {
@@ -20,6 +20,10 @@ module.exports = {
   },
 
   locals: function (options) {
+    options.spec = options.spec !== undefined ?
+      options.spec :
+      this.project.ngConfigObj.get('defaults.spec.service');
+
     return {
       dynamicPath: this.dynamicPath.dir,
       flat: options.flat
diff --git a/packages/angular-cli/lib/config/schema.d.ts b/packages/angular-cli/lib/config/schema.d.ts
@@ -64,5 +64,13 @@ export interface CliConfig {
             style?: boolean;
             template?: boolean;
         };
+        spec?: {
+            class?: boolean;
+            component?: boolean;
+            directive?: boolean;
+            module?: boolean;
+            pipe?: boolean;
+            service?: boolean;
+        };
     };
 }
diff --git a/packages/angular-cli/lib/config/schema.json b/packages/angular-cli/lib/config/schema.json
@@ -151,6 +151,35 @@
               "default": false
             }
           }
+        },
+        "spec": {
+          "type": "object",
+          "properties": {
+            "class": {
+              "type": "boolean",
+              "default": false
+            },
+            "component": {
+              "type": "boolean",
+              "default": true
+            },
+            "directive": {
+              "type": "boolean",
+              "default": true
+            },
+            "module": {
+              "type": "boolean",
+              "default": false
+            },
+            "pipe": {
+              "type": "boolean",
+              "default": true
+            },
+            "service": {
+              "type": "boolean",
+              "default": true
+            }
+          }
         }
       },
       "additionalProperties": false
diff --git a/tests/acceptance/generate-class.spec.js b/tests/acceptance/generate-class.spec.js
@@ -32,7 +32,7 @@ describe('Acceptance: ng generate class', function () {
   it('ng generate class my-class', function () {
     return ng(['generate', 'class', 'my-class']).then(() => {
       expect(existsSync(path.join(testPath, 'my-class.ts'))).to.equal(true);
-      expect(existsSync(path.join(testPath, 'my-class.spec.ts'))).to.equal(true);
+      expect(existsSync(path.join(testPath, 'my-class.spec.ts'))).to.equal(false);
     });
   });
 
