feature(blueprints): add spec/no-spec flags to all blueprints (#2382)

Fixes #2108
angular · Oct 3, 2016 · 9a2c44b · 9a2c44b
1 parent 790a1b4
commit 9a2c44b
Show file tree

Hide file tree

Showing 8 changed files with 136 additions and 19 deletions.
diff --git a/packages/angular-cli/blueprints/class/index.js b/packages/angular-cli/blueprints/class/index.js
@@ -1,13 +1,19 @@
 const stringUtils = require('ember-cli-string-utils');
-var dynamicPathParser = require('../../utilities/dynamic-path-parser');
+const dynamicPathParser = require('../../utilities/dynamic-path-parser');
+const Blueprint = require('ember-cli/lib/models/blueprint');
+const getFiles = Blueprint.prototype.files;
 
 module.exports = {
   description: '',
-  
+
   anonymousOptions: [
     '<class-type>'
   ],
-
+
+  availableOptions: [
+    { name: 'spec', type: Boolean, default: true }
+  ],
+
   normalizeEntityName: function (entityName) {
     var parsedPath = dynamicPathParser(this.project, entityName);
 
@@ -19,15 +25,25 @@ module.exports = {
     var classType = options.args [2]
     this.fileName = stringUtils.dasherize(options.entity.name);
     if (classType) {
-      this.fileName += '.' + classType; 
+      this.fileName += '.' + classType;
     }
-    return { 
+    return {
       dynamicPath: this.dynamicPath.dir,
       flat: options.flat,
       fileName: this.fileName
     };
   },
 
+  files: function() {
+    var fileList = getFiles.call(this);
+
+    if (this.options && !this.options.spec) {
+      fileList = fileList.filter(p => p.indexOf('__name__.spec.ts') < 0);
+    }
+
+    return fileList;
+  },
+
   fileMapTokens: function () {
     // Return custom template variables here.
     return {

diff --git a/packages/angular-cli/blueprints/directive/index.js b/packages/angular-cli/blueprints/directive/index.js
@@ -1,16 +1,19 @@
-var path = require('path');
-var dynamicPathParser = require('../../utilities/dynamic-path-parser');
+const path = require('path');
+const dynamicPathParser = require('../../utilities/dynamic-path-parser');
 const stringUtils = require('ember-cli-string-utils');
 const astUtils = require('../../utilities/ast-utils');
 const findParentModule = require('../../utilities/find-parent-module').default;
 const NodeHost = require('@angular-cli/ast-tools').NodeHost;
+const Blueprint = require('ember-cli/lib/models/blueprint');
+const getFiles = Blueprint.prototype.files;
 
 module.exports = {
   description: '',
 
   availableOptions: [
     { name: 'flat', type: Boolean, default: true },
-    { name: 'prefix', type: Boolean, default: true }
+    { name: 'prefix', type: Boolean, default: true },
+    { name: 'spec', type: Boolean, default: true }
   ],
 
   beforeInstall: function() {
@@ -46,6 +49,16 @@ module.exports = {
     };
   },
 
+  files: function() {
+    var fileList = getFiles.call(this);
+
+    if (this.options && !this.options.spec) {
+      fileList = fileList.filter(p => p.indexOf('__name__.directive.spec.ts') < 0);
+    }
+
+    return fileList;
+  },
+
   fileMapTokens: function (options) {
     // Return custom template variables here.
     return {

diff --git a/packages/angular-cli/blueprints/pipe/index.js b/packages/angular-cli/blueprints/pipe/index.js
@@ -1,15 +1,18 @@
-var path = require('path');
-var dynamicPathParser = require('../../utilities/dynamic-path-parser');
+const path = require('path');
+const dynamicPathParser = require('../../utilities/dynamic-path-parser');
 const stringUtils = require('ember-cli-string-utils');
 const astUtils = require('../../utilities/ast-utils');
 const findParentModule = require('../../utilities/find-parent-module').default;
 const NodeHost = require('@angular-cli/ast-tools').NodeHost;
+const Blueprint = require('ember-cli/lib/models/blueprint');
+const getFiles = Blueprint.prototype.files;
 
 module.exports = {
   description: '',
 
   availableOptions: [
-    { name: 'flat', type: Boolean, default: true }
+    { name: 'flat', type: Boolean, default: true },
+    { name: 'spec', type: Boolean, default: true }
   ],
 
   beforeInstall: function() {
@@ -34,6 +37,16 @@ module.exports = {
     };
   },
 
+  files: function() {
+    var fileList = getFiles.call(this);
+
+    if (this.options && !this.options.spec) {
+      fileList = fileList.filter(p => p.indexOf('__name__.pipe.spec.ts') < 0);
+    }
+
+    return fileList;
+  },
+
   fileMapTokens: function (options) {
     // Return custom template variables here.
     return {

diff --git a/packages/angular-cli/blueprints/service/index.js b/packages/angular-cli/blueprints/service/index.js
@@ -1,12 +1,15 @@
-var path = require('path');
+const path = require('path');
 const chalk = require('chalk');
-var dynamicPathParser = require('../../utilities/dynamic-path-parser');
+const dynamicPathParser = require('../../utilities/dynamic-path-parser');
+const Blueprint = require('ember-cli/lib/models/blueprint');
+const getFiles = Blueprint.prototype.files;
 
 module.exports = {
   description: '',
 
   availableOptions: [
-    { name: 'flat', type: Boolean, default: true }
+    { name: 'flat', type: Boolean, default: true },
+    { name: 'spec', type: Boolean, default: true }
   ],
 
   normalizeEntityName: function (entityName) {
@@ -23,6 +26,16 @@ module.exports = {
     };
   },
 
+  files: function() {
+    var fileList = getFiles.call(this);
+
+    if (this.options && !this.options.spec) {
+      fileList = fileList.filter(p => p.indexOf('__name__.service.spec.ts') < 0);
+    }
+
+    return fileList;
+  },
+
   fileMapTokens: function (options) {
     // Return custom template variables here.
     return {

diff --git a/tests/acceptance/generate-class.spec.js b/tests/acceptance/generate-class.spec.js
@@ -32,9 +32,17 @@ 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);
     });
   });
-
+
+  it('ng generate class my-class --no-spec', function () {
+    return ng(['generate', 'class', 'my-class', '--no-spec']).then(() => {
+      expect(existsSync(path.join(testPath, 'my-class.ts'))).to.equal(true);
+      expect(existsSync(path.join(testPath, 'my-class.spec.ts'))).to.equal(false);
+    });
+  });
+
   it('ng generate class my-class model', function () {
     return ng(['generate', 'class', 'my-class', 'model']).then(() => {
       expect(existsSync(path.join(testPath, 'my-class.model.ts'))).to.equal(true);
@@ -46,7 +54,7 @@ describe('Acceptance: ng generate class', function () {
       expect(existsSync(path.join(testPath, 'shared', 'my-class.ts'))).to.equal(true);
     });
   });
-  
+
   it(`ng generate class shared${path.sep}my-class model`, function () {
     return ng(['generate', 'class', 'shared/my-class', 'model']).then(() => {
       expect(existsSync(path.join(testPath, 'shared', 'my-class.model.ts'))).to.equal(true);

diff --git a/tests/acceptance/generate-directive.spec.js b/tests/acceptance/generate-directive.spec.js
@@ -44,17 +44,33 @@ describe('Acceptance: ng generate directive', function () {
   it('my-dir --flat false', function () {
     const appRoot = path.join(root, 'tmp/foo');
     const testPath = path.join(appRoot, 'src/app/my-dir/my-dir.directive.ts');
+    const testSpecPath = path.join(appRoot, 'src/app/my-dir/my-dir.directive.spec.ts');
     const appModulePath = path.join(appRoot, 'src/app/app.module.ts');
 
     return ng(['generate', 'directive', 'my-dir', '--flat', 'false'])
-      .then(() => expect(existsSync(testPath)).to.equal(true))
+      .then(() => {
+        expect(existsSync(testPath)).to.equal(true);
+        expect(existsSync(testSpecPath)).to.equal(true);
+      })
       .then(() => readFile(appModulePath, 'utf-8'))
       .then(content => {
         expect(content).matches(/import.*\bMyDirDirective\b.*from '.\/my-dir\/my-dir.directive';/);
         expect(content).matches(/declarations:\s*\[[^\]]+?,\r?\n\s+MyDirDirective\r?\n/m);
       });
   });
 
+  it('my-dir --flat false --no-spec', function () {
+    const appRoot = path.join(root, 'tmp/foo');
+    const testPath = path.join(appRoot, 'src/app/my-dir/my-dir.directive.ts');
+    const testSpecPath = path.join(appRoot, 'src/app/my-dir/my-dir.directive.spec.ts');
+
+    return ng(['generate', 'directive', 'my-dir', '--flat', 'false', '--no-spec'])
+      .then(() => {
+        expect(existsSync(testPath)).to.equal(true);
+        expect(existsSync(testSpecPath)).to.equal(false);
+      });
+  });
+
   it('test' + path.sep + 'my-dir', function () {
     fs.mkdirsSync(path.join(root, 'tmp', 'foo', 'src', 'app', 'test'));
     return ng(['generate', 'directive', 'test' + path.sep + 'my-dir', '--flat', 'false']).then(() => {

diff --git a/tests/acceptance/generate-pipe.spec.js b/tests/acceptance/generate-pipe.spec.js
@@ -38,16 +38,32 @@ describe('Acceptance: ng generate pipe', function () {
   it('ng generate pipe my-pipe', function () {
     const appRoot = path.join(root, 'tmp/foo');
     const testPath = path.join(appRoot, 'src/app/my-pipe.pipe.ts');
+    const testSpecPath = path.join(appRoot, 'src/app/my-pipe.pipe.spec.ts');
     const appModulePath = path.join(appRoot, 'src/app/app.module.ts');
     return ng(['generate', 'pipe', 'my-pipe'])
-      .then(() => expect(existsSync(testPath)).to.equal(true))
+      .then(() => {
+        expect(existsSync(testPath)).to.equal(true);
+        expect(existsSync(testSpecPath)).to.equal(true);
+      })
       .then(() => readFile(appModulePath, 'utf-8'))
       .then(content => {
         expect(content).matches(/import.*\bMyPipePipe\b.*from '.\/my-pipe.pipe';/);
         expect(content).matches(/declarations:\s*\[[^\]]+?,\r?\n\s+MyPipePipe\r?\n/m);
       });
   });
 
+  it('ng generate pipe my-pipe --no-spec', function () {
+    const appRoot = path.join(root, 'tmp/foo');
+    const testPath = path.join(appRoot, 'src/app/my-pipe.pipe.ts');
+    const testSpecPath = path.join(appRoot, 'src/app/my-pipe.pipe.spec.ts');
+
+    return ng(['generate', 'pipe', 'my-pipe', '--no-spec'])
+      .then(() => {
+        expect(existsSync(testPath)).to.equal(true);
+        expect(existsSync(testSpecPath)).to.equal(false);
+      });
+  });
+
   it('ng generate pipe test' + path.sep + 'my-pipe', function () {
     fs.mkdirsSync(path.join(root, 'tmp', 'foo', 'src', 'app', 'test'));
     return ng(['generate', 'pipe', 'test' + path.sep + 'my-pipe']).then(() => {

diff --git a/tests/acceptance/generate-service.spec.js b/tests/acceptance/generate-service.spec.js
@@ -37,10 +37,32 @@ describe('Acceptance: ng generate service', function () {
   it('ng generate service my-svc', function () {
     const appRoot = path.join(root, 'tmp/foo');
     const testPath = path.join(appRoot, 'src/app/my-svc.service.ts');
+    const testSpecPath = path.join(appRoot, 'src/app/my-svc.service.spec.ts');
     const appModulePath = path.join(appRoot, 'src/app/app.module.ts');
 
     return ng(['generate', 'service', 'my-svc'])
-      .then(() => expect(existsSync(testPath)).to.equal(true))
+      .then(() => {
+        expect(existsSync(testPath)).to.equal(true);
+        expect(existsSync(testSpecPath)).to.equal(true);
+      })
+      .then(() => readFile(appModulePath, 'utf-8'))
+      .then(content => {
+        expect(content).not.to.matches(/import.*\MySvcService\b.*from '.\/my-svc.service';/);
+        expect(content).not.to.matches(/providers:\s*\[MySvcService\]/m);
+      });
+  });
+
+  it('ng generate service my-svc --no-spec', function () {
+    const appRoot = path.join(root, 'tmp/foo');
+    const testPath = path.join(appRoot, 'src/app/my-svc.service.ts');
+    const testSpecPath = path.join(appRoot, 'src/app/my-svc.service.spec.ts');
+    const appModulePath = path.join(appRoot, 'src/app/app.module.ts');
+
+    return ng(['generate', 'service', 'my-svc', '--no-spec'])
+      .then(() => {
+        expect(existsSync(testPath)).to.equal(true);
+        expect(existsSync(testSpecPath)).to.equal(false);
+      })
       .then(() => readFile(appModulePath, 'utf-8'))
       .then(content => {
         expect(content).not.to.matches(/import.*\MySvcService\b.*from '.\/my-svc.service';/);