Import blueprints from ember.js

see emberjs/ember.js#13029

blueprints/-addon-import.js

@@ -0,0 +1,54 @@
+/*jshint node:true*/
+
+var stringUtil  = require('ember-cli-string-utils');
+var path        = require('path');
+var inflector   = require('inflection');
+
+module.exports = {
+  description: 'Generates an import wrapper.',
+
+  fileMapTokens: function() {
+    return {
+      __name__: function(options) {
+        if (options.pod && options.hasPathToken) {
+          return options.locals.blueprintName;
+        }
+        return options.dasherizedModuleName;
+      },
+      __path__: function(options) {
+        if (options.pod && options.hasPathToken) {
+          return path.join(options.podPath, options.dasherizedModuleName);
+        }
+        return inflector.pluralize(options.locals.blueprintName);
+      },
+      __root__: function(options) {
+        if (options.inRepoAddon) {
+          return path.join('lib', options.inRepoAddon, 'app');
+        }
+        return 'app';
+      }
+    };
+  },
+
+  locals: function(options) {
+    var addonRawName       = options.inRepoAddon ? options.inRepoAddon : options.project.name();
+    var addonName          = stringUtil.dasherize(addonRawName);
+    var fileName           = stringUtil.dasherize(options.entity.name);
+    var blueprintName      = options.originBlueprintName;
+    var modulePathSegments = [addonName, inflector.pluralize(options.originBlueprintName), fileName];
+
+    if (blueprintName.match(/-addon/)) {
+      blueprintName = blueprintName.substr(0,blueprintName.indexOf('-addon'));
+      modulePathSegments = [addonName, inflector.pluralize(blueprintName), fileName];
+    }
+
+    if (options.pod) {
+      modulePathSegments = [addonName, fileName, blueprintName];
+    }
+
+    return {
+      modulePath: modulePathSegments.join('/'),
+      blueprintName: blueprintName
+    };
+  }
+};

blueprints/acceptance-test/index.js

@@ -3,18 +3,27 @@
 var testInfo    = require('ember-cli-test-info');
 var pathUtil    = require('ember-cli-path-utils');
 var stringUtils = require('ember-cli-string-utils');
+var existsSync  = require('exists-sync');
+var path        = require('path');
+var useTestFrameworkDetector = require('../test-framework-detector');
 
-module.exports = {
+module.exports = useTestFrameworkDetector({
   description: 'Generates an acceptance test for a feature.',
+
   locals: function(options) {
     var testFolderRoot = stringUtils.dasherize(options.project.name());
 
     if (options.project.isEmberCLIAddon()) {
       testFolderRoot = pathUtil.getRelativeParentPath(options.entity.name, -1, false);
     }
+
+    var destroyAppExists =
+      existsSync(path.join(this.project.root, '/tests/helpers/destroy-app.js'));
+
     return {
       testFolderRoot: testFolderRoot,
-      friendlyTestName: testInfo.name(options.entity.name, "Acceptance", null)
+      friendlyTestName: testInfo.name(options.entity.name, 'Acceptance', null),
+      destroyAppExists: destroyAppExists
     };
   }
-};
+});

blueprints/acceptance-test/mocha-files/tests/acceptance/__name__-test.js

@@ -0,0 +1,25 @@
+/* jshint expr:true */
+import { describe, it, beforeEach, afterEach } from 'mocha';
+import { expect } from 'chai';
+import startApp from '../helpers/start-app';
+<% if (destroyAppExists) { %>import destroyApp from '../helpers/destroy-app';<% } else { %>import Ember from 'ember';<% } %>
+
+describe('<%= friendlyTestName %>', function() {
+  let application;
+
+  beforeEach(function() {
+    application = startApp();
+  });
+
+  afterEach(function() {
+    <% if (destroyAppExists) { %>destroyApp(application);<% } else { %>Ember.run(application, 'destroy');<% } %>
+  });
+
+  it('can visit /<%= dasherizedModuleName %>', function() {
+    visit('/<%= dasherizedModuleName %>');
+
+    andThen(function() {
+      expect(currentURL()).to.equal('/<%= dasherizedModuleName %>');
+    });
+  });
+});

blueprints/acceptance-test/qunit-files/tests/acceptance/__name__-test.js

@@ -0,0 +1,12 @@
+import { test } from 'qunit';
+import moduleForAcceptance from '<%= testFolderRoot %>/tests/helpers/module-for-acceptance';
+
+moduleForAcceptance('<%= friendlyTestName %>');
+
+test('visiting /<%= dasherizedModuleName %>', function(assert) {
+  visit('/<%= dasherizedModuleName %>');
+
+  andThen(function() {
+    assert.equal(currentURL(), '/<%= dasherizedModuleName %>');
+  });
+});

blueprints/component-addon/index.js

@@ -1,8 +1,8 @@
 /*jshint node:true*/
 
 var stringUtil         = require('ember-cli-string-utils');
-var validComponentName = require('ember-cli/lib/utilities/valid-component-name');
-var getPathOption      = require('ember-cli/lib/utilities/get-component-path-option');
+var validComponentName = require('ember-cli-valid-component-name');
+var getPathOption      = require('ember-cli-get-component-path-option');
 var path               = require('path');
 var normalizeEntityName = require('ember-cli-normalize-entity-name');
 

blueprints/component-test/index.js

@@ -3,9 +3,11 @@
 var path          = require('path');
 var testInfo      = require('ember-cli-test-info');
 var stringUtil    = require('ember-cli-string-utils');
-var getPathOption = require('ember-cli/lib/utilities/get-component-path-option');
+var isPackageMissing = require('ember-cli-is-package-missing');
+var getPathOption = require('ember-cli-get-component-path-option');
+var useTestFrameworkDetector = require('../test-framework-detector');
 
-module.exports = {
+module.exports = useTestFrameworkDetector({
   description: 'Generates a component integration or unit test.',
 
   availableOptions: [
@@ -38,15 +40,15 @@ module.exports = {
   locals: function(options) {
     var dasherizedModuleName = stringUtil.dasherize(options.entity.name);
     var componentPathName = dasherizedModuleName;
-    var testType = options.testType || "integration";
-    var friendlyTestDescription = testInfo.description(options.entity.name, "Integration", "Component");
+    var testType = options.testType || 'integration';
+    var friendlyTestDescription = testInfo.description(options.entity.name, 'Integration', 'Component');
 
     if (options.pod && options.path !== 'components' && options.path !== '') {
       componentPathName = [options.path, dasherizedModuleName].join('/');
     }
 
     if (options.testType === 'unit') {
-      friendlyTestDescription = testInfo.description(options.entity.name, "Unit", "Component");
+      friendlyTestDescription = testInfo.description(options.entity.name, 'Unit', 'Component');
     }
 
     return {
@@ -55,5 +57,12 @@ module.exports = {
       componentPathName: componentPathName,
       friendlyTestDescription: friendlyTestDescription
     };
+  },
+  afterInstall: function(options) {
+    if (!options.dryRun && options.testType === 'integration' && isPackageMissing(this, 'ember-cli-htmlbars-inline-precompile')) {
+      return this.addPackagesToProject([
+        { name: 'ember-cli-htmlbars-inline-precompile', target: '^0.3.1' }
+      ]);
+    }
   }
-};
+});

blueprints/component-test/mocha-files/tests/__testType__/__path__/__test__.js

@@ -0,0 +1,32 @@
+/* jshint expr:true */
+import { expect } from 'chai';
+import { describeComponent, it } from 'ember-mocha';<% if (testType === 'integration') { %>
+import hbs from 'htmlbars-inline-precompile';<% } %>
+
+describeComponent('<%= componentPathName %>', '<%= friendlyTestDescription %>',
+  {
+    <% if (testType === 'integration' ) { %>integration: true<% } else if(testType === 'unit') { %>// Specify the other units that are required for this test
+    // needs: ['component:foo', 'helper:bar'],
+    unit: true<% } %>
+  },
+  function() {
+    it('renders', function() {
+      <% if (testType === 'integration' ) { %>// Set any properties with this.set('myProperty', 'value');
+      // Handle any actions with this.on('myAction', function(val) { ... });
+      // Template block usage:
+      // this.render(hbs`
+      //   {{#<%= dasherizedModuleName %>}}
+      //     template content
+      //   {{/<%= dasherizedModuleName %>}}
+      // `);
+
+      this.render(hbs`{{<%= dasherizedModuleName %>}}`);
+      expect(this.$()).to.have.length(1);<% } else if(testType === 'unit') { %>// creates the component instance
+      let component = this.subject();
+      // renders the component on the page
+      this.render();
+      expect(component).to.be.ok;
+      expect(this.$()).to.have.length(1);<% } %>
+    });
+  }
+);

blueprints/component-test/files/tests/__testType__/__path__/__test__.js → blueprints/component-test/qunit-files/tests/__testType__/__path__/__test__.js

@@ -8,26 +8,23 @@ moduleForComponent('<%= componentPathName %>', '<%= friendlyTestDescription %>',
 });
 
 test('it renders', function(assert) {
-  <% if (testType === 'integration' ) { %>assert.expect(2);
-
-  // Set any properties with this.set('myProperty', 'value');
-  // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+  <% if (testType === 'integration' ) { %>// Set any properties with this.set('myProperty', 'value');
+  // Handle any actions with this.on('myAction', function(val) { ... });
 
   this.render(hbs`{{<%= componentPathName %>}}`);
 
   assert.equal(this.$().text().trim(), '');
 
-  // Template block usage:" + EOL +
+  // Template block usage:
   this.render(hbs`
     {{#<%= componentPathName %>}}
       template block text
     {{/<%= componentPathName %>}}
   `);
 
-  assert.equal(this.$().text().trim(), 'template block text');<% } else if(testType === 'unit') { %>assert.expect(1);
-
+  assert.equal(this.$().text().trim(), 'template block text');<% } else if(testType === 'unit') { %>
   // Creates the component instance
-  /*var component =*/ this.subject();
+  /*let component =*/ this.subject();
   // Renders the component to the page
   this.render();
   assert.equal(this.$().text().trim(), '');<% } %>

blueprints/component/index.js

@@ -2,8 +2,8 @@
 
 var stringUtil         = require('ember-cli-string-utils');
 var pathUtil           = require('ember-cli-path-utils');
-var validComponentName = require('ember-cli/lib/utilities/valid-component-name');
-var getPathOption      = require('ember-cli/lib/utilities/get-component-path-option');
+var validComponentName = require('ember-cli-valid-component-name');
+var getPathOption      = require('ember-cli-get-component-path-option');
 var path               = require('path');
 
 var normalizeEntityName = require('ember-cli-normalize-entity-name');
@@ -64,7 +64,7 @@ module.exports = {
           'templates/components/' + stringUtil.dasherize(options.entity.name);
       }
       importTemplate   = 'import layout from \'' + templatePath + '\';\n';
-      contents         = '\n  layout: layout';
+      contents         = '\n  layout';
     }
 
     return {

blueprints/controller-test/index.js

@@ -1,5 +1,13 @@
 /*jshint node:true*/
 
-module.exports = {
-  description: 'Generates a controller unit test.'
-};
+var testInfo = require('ember-cli-test-info');
+var useTestFrameworkDetector = require('../test-framework-detector');
+
+module.exports = useTestFrameworkDetector({
+  description: 'Generates a controller unit test.',
+  locals: function(options) {
+    return {
+      friendlyTestDescription: testInfo.description(options.entity.name, 'Unit', 'Controller')
+    };
+  }
+});

blueprints/controller-test/mocha-files/tests/unit/__path__/__test__.js

@@ -0,0 +1,17 @@
+/* jshint expr:true */
+import { expect } from 'chai';
+import { describeModule, it } from 'ember-mocha';
+
+describeModule('controller:<%= dasherizedModuleName %>', '<%= friendlyTestDescription %>',
+  {
+    // Specify the other units that are required for this test.
+    // needs: ['controller:foo']
+  },
+  function() {
+    // Replace this with your real tests.
+    it('exists', function() {
+      let controller = this.subject();
+      expect(controller).to.be.ok;
+    });
+  }
+);

blueprints/controller-test/files/tests/unit/__path__/__test__.js → blueprints/controller-test/qunit-files/tests/unit/__path__/__test__.js

@@ -1,12 +1,12 @@
 import { moduleFor, test } from 'ember-qunit';
 
-moduleFor('controller:<%= dasherizedModuleName %>', {
+moduleFor('controller:<%= dasherizedModuleName %>', '<%= friendlyTestDescription %>', {
   // Specify the other units that are required for this test.
   // needs: ['controller:foo']
 });
 
 // Replace this with your real tests.
 test('it exists', function(assert) {
-  var controller = this.subject();
+  let controller = this.subject();
   assert.ok(controller);
 });

blueprints/helper-addon/index.js

@@ -1,3 +1,3 @@
 /*jshint node:true*/
 
-module.exports = require('ember-cli/blueprints/addon-import');
+module.exports = require('../-addon-import');

blueprints/helper-test/index.js

@@ -1,14 +1,15 @@
 /*jshint node:true*/
 
-var getDependencyDepth = require('ember-cli-get-dependency-depth');
 var testInfo = require('ember-cli-test-info');
+var stringUtils = require('ember-cli-string-utils');
+var useTestFrameworkDetector = require('../test-framework-detector');
 
-module.exports = {
+module.exports = useTestFrameworkDetector({
   description: 'Generates a helper unit test.',
   locals: function(options) {
     return {
-      friendlyTestName: testInfo.name(options.entity.name, "Unit", "Helper"),
-      dependencyDepth: getDependencyDepth(options.entity.name)
+      friendlyTestName: testInfo.name(options.entity.name, 'Unit', 'Helper'),
+      dasherizedModulePrefix: stringUtils.dasherize(options.project.config().modulePrefix)
     };
   }
-};
+});

blueprints/helper-test/mocha-files/tests/unit/helpers/__name__-test.js

@@ -0,0 +1,12 @@
+/* jshint expr:true */
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { <%= camelizedModuleName %> } from '<%= dasherizedPackageName %>/helpers/<%= dasherizedModuleName %>';
+
+describe('<%= friendlyTestName %>', function() {
+  // Replace this with your real tests.
+  it('works', function() {
+    let result = <%= camelizedModuleName %>(42);
+    expect(result).to.be.ok;
+  });
+});

blueprints/helper-test/files/tests/unit/helpers/__name__-test.js → blueprints/helper-test/qunit-files/tests/unit/helpers/__name__-test.js

@@ -1,10 +1,10 @@
-import { <%= camelizedModuleName %> } from '<%= dependencyDepth %>/helpers/<%= dasherizedModuleName %>';
+import { <%= camelizedModuleName %> } from '<%= dasherizedModulePrefix %>/helpers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 
 module('<%= friendlyTestName %>');
 
 // Replace this with your real tests.
 test('it works', function(assert) {
-  var result = <%= camelizedModuleName %>(42);
+  let result = <%= camelizedModuleName %>([42]);
   assert.ok(result);
 });

blueprints/initializer-addon/index.js

@@ -1,3 +1,3 @@
 /*jshint node:true*/
 
-module.exports = require('ember-cli/blueprints/addon-import');
+module.exports = require('../-addon-import');