Merge pull request #70 from simonihmig/update-blueprints

Update blueprints

Author: simonihmig

.eslintrc.js

@@ -33,12 +33,14 @@ module.exports = {
         'config/**/*.js',
         'tests/dummy/config/**/*.js',
         'lib/feature-parser.js',
-        'blueprints/*.js'
+        'blueprints/*.js',
+        'node-tests/**/*.js'
       ],
       excludedFiles: [
         'app/**',
         'addon/**',
-        'tests/dummy/app/**'
+        'tests/dummy/app/**',
+        'node-tests/fixtures/**'
       ],
       parserOptions: {
         sourceType: 'script',
@@ -52,6 +54,14 @@ module.exports = {
       rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
         // add your custom rules and overrides for node files here
       })
+    },
+    {
+      files: [
+        'node-tests/**/*.js'
+      ],
+      env: {
+        mocha: true
+      }
     }
   ]
 };

.npmignore

@@ -1,10 +1,8 @@
-/bower_components
 /config/ember-try.js
 /dist
 /tests
 /tmp
 **/.gitkeep
-.bowerrc
 .editorconfig
 .ember-cli
 .eslintrc.js
@@ -19,3 +17,4 @@ testem.js
 .node_modules.ember-try/
 bower.json.ember-try
 package.json.ember-try
+/node-tests

.travis.yml

@@ -25,6 +25,7 @@ env:
   - EMBER_TRY_SCENARIO=ember-release ANNOTATIONS=acceptance,smoke
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
+  - EMBER_TRY_SCENARIO=node-tests
 
 matrix:
   fast_finish: true

blueprints/feature-index.js

@@ -1,7 +1,16 @@
 'use strict';
 
+const annotationMap = {
+  acceptance: '@setupApplicationTest',
+  integration: '@setupRenderingTest',
+  unit: '@setupTest'
+};
+
 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

@@ -1,14 +1,14 @@
 import yadda from '../../helpers/yadda';
+import { expect } from 'chai';
+import { visit } from '@ember/test-helpers';
 
 export default function() {
   return yadda.localisation.English.library()
-    .given('I type "Ember g feature make-feature"', function(next) {
-      visit('/');
-      // Add your own assert library
-      andThen(() => next());
+    .given('I type "Ember g feature make-feature"', async function() {
+      await visit('/');
+      expect(true, this.step).to.be.true;
     })
-    .when('I look in the folder', function(next) {
-      // Add your own assert library
-      next();
+    .when('I look in the folder', function() {
+      expect(true, this.step).to.be.true;
     });
 }

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

@@ -1,10 +1,9 @@
 import ENV from '../../config/environment';
 import { describe } from 'mocha';
-import Ember from 'ember';
+import { setupApplicationTest, setupRenderingTest, setupTest } from 'ember-mocha';
 
 // this logic could be anything, but in this case...
 // if @ignore, then return skip (for backwards compatibility)
-// if no annotations are set in the config, run everything without an annotation (for backwards compatibility)
 // if have annotations in config, then only run those that have a matching annotation
 function checkAnnotations(annotations) {
 
@@ -25,17 +24,6 @@ function checkAnnotations(annotations) {
 
     // no match, so don't run it
     return logIt;
-
-  } else {
-    // no annotations set, so run it for backwards compatibility
-    // unless it has annotations, then don't run it
-    if (Object.keys(annotations).length) {
-      // has annotation, so don't run it
-      return logIt;
-    } else {
-      // no annotations, so test it
-      return 'testIt';  // return something other than a function
-    }
   }
 }
 
@@ -45,8 +33,7 @@ function ignoreIt(testElement) {
 }
 
 function logIt(testElement) {
-  // change this to do what you need it to do
-  Ember.Logger.info(`Not running or skipping: "${testElement.title}"`);
+  console.info(`Not running or skipping: "${testElement.title}"`); // eslint-disable-line no-console
 }
 
 // exported functions
@@ -58,4 +45,35 @@ function runScenario(featureAnnotations, scenarioAnnotations) {
   return checkAnnotations(scenarioAnnotations);
 }
 
-export { runFeature, runScenario };
+// setup tests
+// you can override these function to add additional setup setups, or handle new setup related annotations
+function setupFeature(featureAnnotations) {
+  return setupYaddaTest(featureAnnotations);
+}
+
+function setupScenario(featureAnnotations, scenarioAnnotations) {
+  let setupFn = setupYaddaTest(scenarioAnnotations);
+  if (setupFn && (featureAnnotations.application || featureAnnotations.rendering || featureAnnotations.context)) {
+    throw new Error('You must not assign any @application, @rendering or @context annotations to a scenario as well as its feature!');
+  }
+  return setupFn;
+}
+
+function setupYaddaTest(annotations) {
+  if (annotations.setupapplicationtest) {
+    return setupApplicationTest;
+  }
+  if (annotations.setuprenderingtest) {
+    return setupRenderingTest;
+  }
+  if (annotations.setuptest) {
+    return setupTest;
+  }
+}
+
+export {
+  runFeature,
+  runScenario,
+  setupFeature,
+  setupScenario
+};

blueprints/mocha/ember-cli-yadda/files/tests/helpers/yadda-annotations.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

@@ -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/unit/steps/steps.js

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

blueprints/qunit/feature-unit/files/tests/unit/__folder__/__name__.feature renamed to blueprints/mocha/feature/files/tests/__type__/__folder__/__name__.feature

@@ -1,12 +1,12 @@
 import steps from '<%= foldersUp %>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(next) {
-      // Add your own assert library
-      next();
+    .then('I should find a file', function() {
+      expect(true, this.step).to.be.true;
     });
 }

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,14 +1,13 @@
 import yadda from '../../helpers/yadda';
+import { visit } from '@ember/test-helpers';
 
 export default function(assert) {
   return yadda.localisation.English.library()
-    .given('I type "Ember g feature make-feature"', function(next) {
-      visit('/');
+    .given('I type "Ember g feature make-feature"', async function() {
+      await visit('/');
       assert.ok(true, this.step);
-      andThen(() => next());
     })
-    .when('I look in the folder', function(next) {
+    .when('I look in the folder', function() {
       assert.ok(true, this.step);
-      next();
     });
 }

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

@@ -1,10 +1,9 @@
 import ENV from '../../config/environment';
-import { skip } from 'ember-qunit';
-import Ember from 'ember';
+import { skip } from 'qunit';
+import { setupApplicationTest, setupRenderingTest, setupTest } from 'ember-qunit';
 
 // this logic could be anything, but in this case...
 // if @ignore, then return skip (for backwards compatibility)
-// if no annotations are set in the config, run everything without an annotation (for backwards compatibility)
 // if have annotations in config, then only run those that have a matching annotation
 function checkAnnotations(annotations) {
 
@@ -25,27 +24,16 @@ function checkAnnotations(annotations) {
 
     // no match, so don't run it
     return logIt;
-
-  } else {
-    // no annotations set, so run it for backwards compatibility
-    // unless it has annotations, then don't run it
-    if (Object.keys(annotations).length) {
-      // has annotation, so don't run it
-      return logIt;
-    } else {
-      // no annotations, so test it
-      return 'testIt';  // return something other than a function
-    }
   }
 }
 
 // call back functions
 function ignoreIt(testElement) {
-  skip(`${testElement.title}`, function(assert) {});
+  skip(`${testElement.title}`, function(/*assert*/) {});
 }
 
 function logIt(testElement) {
-  Ember.Logger.info(`Not running or skipping: "${testElement.title}"`);
+  console.info(`Not running or skipping: "${testElement.title}"`); // eslint-disable-line no-console
 }
 
 // exported functions
@@ -57,4 +45,35 @@ function runScenario(featureAnnotations, scenarioAnnotations) {
   return checkAnnotations(scenarioAnnotations);
 }
 
-export { runFeature, runScenario };
+// setup tests
+// you can override these function to add additional setup setups, or handle new setup related annotations
+function setupFeature(featureAnnotations) {
+  return setupYaddaTest(featureAnnotations);
+}
+
+function setupScenario(featureAnnotations, scenarioAnnotations) {
+  let setupFn = setupYaddaTest(scenarioAnnotations);
+  if (setupFn && (featureAnnotations.application || featureAnnotations.rendering || featureAnnotations.context)) {
+    throw new Error('You must not assign any @application, @rendering or @context annotations to a scenario as well as its feature!');
+  }
+  return setupFn;
+}
+
+function setupYaddaTest(annotations) {
+  if (annotations.setupapplicationtest) {
+    return setupApplicationTest;
+  }
+  if (annotations.setuprenderingtest) {
+    return setupRenderingTest;
+  }
+  if (annotations.setuptest) {
+    return setupTest;
+  }
+}
+
+export {
+  runFeature,
+  runScenario,
+  setupFeature,
+  setupScenario
+};

blueprints/qunit/ember-cli-yadda/files/tests/helpers/yadda-annotations.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);
+    });
+}