Add --type option for unit and integration tests

Author: simonihmig

blueprints/feature-index.js

@@ -1,7 +1,16 @@
 'use strict';
 
+const annotationMap = {
+  acceptance: '@application',
+  integration: '@rendering',
+  unit: '@context'
+};
+
 module.exports = {
   description: 'Adds a feature to the project',
+  availableOptions: [
+    { name: 'type', type: String, aliases: ['t'], default: 'acceptance' },
+  ],
 
   locals(options) {
     return {
@@ -18,7 +27,9 @@ module.exports = {
           return './';
         }
         return (path + '/').replace(/.+?\//g, '../');
-      }())
+      }()),
+      type: options.type,
+      annotation: annotationMap[options.type] || ''
     };
   },
 
@@ -32,6 +43,9 @@ module.exports = {
     return {
       __folder__: function(options) {
         return options.locals.folder;
+      },
+      __type__: function(options) {
+        return options.locals.type;
       }
     };
   }

blueprints/feature-unit-index.js

@@ -0,0 +1,12 @@
+import yadda from '../../helpers/yadda';
+import { expect } from 'chai';
+
+export default function() {
+  return yadda.localisation.English.library()
+    .given('I type "Ember g feature make-feature"', function(){
+      expect(true, this.step).to.be.true;
+    })
+    .when('I look in the folder', function(){
+      expect(true, this.step).to.be.true;
+    });
+}

blueprints/mocha/ember-cli-yadda/files/tests/integration/steps/steps.js

@@ -1,4 +1,4 @@
-@application
+<%= annotation %>
 Feature: <%= featureName %>
 
   Scenario: the one where I type ember g feature

blueprints/mocha/feature/files/tests/acceptance/__folder__/__name__.feature renamed to blueprints/mocha/feature/files/tests/__type__/__folder__/__name__.feature

@@ -0,0 +1,11 @@
+import yadda from '../../helpers/yadda';
+
+export default function(assert) {
+  return yadda.localisation.English.library()
+    .given('I type "Ember g feature make-feature"', function(){
+      assert.ok(true, this.step);
+    })
+    .when('I look in the folder', function(){
+      assert.ok(true, this.step);
+    });
+}

blueprints/mocha/feature/files/tests/acceptance/steps/__folder__/__name__-steps.js renamed to blueprints/mocha/feature/files/tests/__type__/steps/__folder__/__name__-steps.js

@@ -1,4 +1,4 @@
-@application
+<%= annotation %>
 Feature: <%= featureName %>
 
   Scenario: the one where I type ember g feature

blueprints/qunit/ember-cli-yadda/files/tests/integration/steps/steps.js

@@ -10,17 +10,25 @@ const expect = require('ember-cli-blueprint-test-helpers/chai').expect;
 
 const fixture = require('../helpers/fixture');
 
+const testTypes = [
+  'acceptance',
+  'integration',
+  'unit',
+];
+
+const frameworkTypes = [
+  'qunit',
+  'mocha'
+];
+
 describe('Acceptance: ember generate and destroy feature', function() {
   setupTestHooks(this);
 
   beforeEach(function() {
     return emberNew();
   });
 
-  [
-    'qunit',
-    'mocha'
-  ].forEach((testFramework) => {
+  frameworkTypes.forEach((testFramework) => {
 
     describe(testFramework, function() {
 
@@ -33,15 +41,27 @@ describe('Acceptance: ember generate and destroy feature', function() {
         });
       }
 
-      it('feature foo', function() {
+      it('ember g feature foo', function() {
         let args = ['feature', 'foo'];
 
-        // pass any additional command line options in the arguments array
         return emberGenerateDestroy(args, (file) => {
           expect(file('tests/acceptance/foo.feature')).to.equal(fixture('acceptance/foo.feature'));
           expect(file('tests/acceptance/steps/foo-steps.js')).to.equal(fixture(`acceptance/${testFramework}/foo-steps.js`));
         });
       });
+
+      testTypes.forEach((type) => {
+
+        it(`ember g feature foo --type=${type}`, function() {
+          let args = ['feature', 'foo', `--type=${type}`];
+
+          return emberGenerateDestroy(args, (file) => {
+            expect(file(`tests/${type}/foo.feature`)).to.equal(fixture(`${type}/foo.feature`));
+            expect(file(`tests/${type}/steps/foo-steps.js`)).to.equal(fixture(`${type}/${testFramework}/foo-steps.js`));
+          });
+        });
+
+      });
     });
   });
 });

blueprints/qunit/feature-unit/files/index.js

@@ -12,17 +12,25 @@ const file = chai.file;
 
 const fixture = require('../helpers/fixture');
 
+const testTypes = [
+  'acceptance',
+  'integration',
+  'unit',
+];
+
+const frameworkTypes = [
+  'qunit',
+  'mocha'
+];
+
 describe('Acceptance: ember generate ember-cli-yadda', function() {
   setupTestHooks(this);
 
   beforeEach(function() {
     return emberNew();
   });
 
-  [
-    'qunit',
-    'mocha'
-  ].forEach((testFramework) => {
+  frameworkTypes.forEach((testFramework) => {
 
     describe(testFramework, function() {
 
@@ -41,9 +49,9 @@ describe('Acceptance: ember generate ember-cli-yadda', function() {
         let fixtureFiles = [
           'helpers/yadda.js',
           'helpers/yadda-annotations.js',
-          // 'unit/steps/steps.js',
-          'acceptance/steps/steps.js',
-        ];
+        ].concat(
+          testTypes.map((type) => `${type}/steps/steps.js`)
+        );
 
         return emberGenerate(args)
           .then(() => fixtureFiles.forEach((fileName) => expect(file(`tests/${fileName}`)).to.equal(fixture(`main/${testFramework}/${fileName}`))));

blueprints/qunit/feature-unit/index.js

@@ -1,4 +1,5 @@
-Feature: <%= featureName %>
+@rendering
+Feature: foo
 
   Scenario: the one where I type ember g feature
 

blueprints/qunit/feature/files/tests/acceptance/__folder__/__name__.feature renamed to blueprints/qunit/feature/files/tests/__type__/__folder__/__name__.feature

@@ -0,0 +1,12 @@
+import steps from './steps';
+import { expect } from 'chai';
+
+// step definitions that are shared between features should be moved to the
+// tests/acceptance/steps/steps.js file
+
+export default function() {
+  return steps()
+    .then('I should find a file', function() {
+      expect(true, this.step).to.be.true;
+    });
+}

blueprints/qunit/feature/files/tests/acceptance/steps/__folder__/__name__-steps.js renamed to blueprints/qunit/feature/files/tests/__type__/steps/__folder__/__name__-steps.js

@@ -1,12 +1,11 @@
-import steps from '<%= foldersUp %>steps';
+import steps from './steps';
 
 // step definitions that are shared between features should be moved to the
-// tests/unit/steps/steps.js file
+// tests/acceptance/steps/steps.js file
 
 export default function(assert) {
   return steps(assert)
-    .then('I should find a file', function(next){
+    .then('I should find a file', function() {
       assert.ok(true, this.step);
-      next();
     });
 }

node-tests/blueprints/feature-test.js

@@ -0,0 +1,12 @@
+import yadda from '../../helpers/yadda';
+import { expect } from 'chai';
+
+export default function() {
+  return yadda.localisation.English.library()
+    .given('I type "Ember g feature make-feature"', function(){
+      expect(true, this.step).to.be.true;
+    })
+    .when('I look in the folder', function(){
+      expect(true, this.step).to.be.true;
+    });
+}

node-tests/blueprints/main-test.js

@@ -0,0 +1,11 @@
+import yadda from '../../helpers/yadda';
+
+export default function(assert) {
+  return yadda.localisation.English.library()
+    .given('I type "Ember g feature make-feature"', function(){
+      assert.ok(true, this.step);
+    })
+    .when('I look in the folder', function(){
+      assert.ok(true, this.step);
+    });
+}

blueprints/qunit/feature-unit/files/tests/unit/__folder__/__name__.feature renamed to node-tests/fixtures/integration/foo.feature

@@ -0,0 +1,8 @@
+@context
+Feature: foo
+
+  Scenario: the one where I type ember g feature
+
+    Given I type "Ember g feature make-feature"
+    When I look in the folder
+    Then I should find a file

node-tests/fixtures/integration/mocha/foo-steps.js

@@ -0,0 +1,12 @@
+import steps from './steps';
+import { expect } from 'chai';
+
+// step definitions that are shared between features should be moved to the
+// tests/acceptance/steps/steps.js file
+
+export default function() {
+  return steps()
+    .then('I should find a file', function() {
+      expect(true, this.step).to.be.true;
+    });
+}

blueprints/qunit/feature-unit/files/tests/unit/steps/__folder__/__name__-steps.js renamed to node-tests/fixtures/integration/qunit/foo-steps.js

@@ -0,0 +1,11 @@
+import steps from './steps';
+
+// step definitions that are shared between features should be moved to the
+// tests/acceptance/steps/steps.js file
+
+export default function(assert) {
+  return steps(assert)
+    .then('I should find a file', function() {
+      assert.ok(true, this.step);
+    });
+}