ember-source 4.5.0-beta.1 → 4.5.1

package/CHANGELOG.md

@@ -1,10 +1,22 @@
 # Ember Changelog
 
-### v4.5.0-beta.1 (May 2, 2022)
+### v4.5.1 (July 25, 2022)
+
+- [#20120](https://github.com/emberjs/ember.js/pull/20120) [BUGFIX] Adjust uniqueId() implementation to only generate valid selectors.
+
+### v4.5.0 (June 13, 2022)
 
 - [#20052](https://github.com/emberjs/ember.js/pull/20052) / [#20055](https://github.com/emberjs/ember.js/pull/20055) [FEATURE] Add the default helper manager to implement [RFC #0756](https://github.com/emberjs/rfcs/blob/master/text/0756-helper-default-manager.md).
 - [#20053](https://github.com/emberjs/ember.js/pull/20053) [FEATURE] Expose `renderSettled` from `@ember/renderer` to enable implementation of [RFC #0785](https://github.com/emberjs/rfcs/blob/master/text/0785-remove-set-get-in-tests.md).
 
+### v4.4.2 (June 13, 2022)
+
+- [#20114](https://github.com/emberjs/ember.js/pull/20114) [BUGFIX] Fix generated import paths for test setup functions in addons
+
+### v4.4.1 (May 31, 2022)
+
+- [#20082](https://github.com/emberjs/ember.js/pull/20082) [BUGFIX] Fix blueprints publication
+
 ### v4.4.0 (May 2, 2022)
 
 - [#19882](https://github.com/emberjs/ember.js/pull/19882) / [#20005](https://github.com/emberjs/ember.js/pull/20005) [FEATURE] Implement the `unique-id` helper per [RFC #0659](https://github.com/emberjs/rfcs/blob/master/text/0659-unique-id-helper.md).

package/blueprints/-utils.js

@@ -0,0 +1,9 @@
+const { dasherize } = require('ember-cli-string-utils');
+
+function modulePrefixForProject(project) {
+  return dasherize(project.config().modulePrefix);
+}
+
+module.exports = {
+  modulePrefixForProject,
+};

package/blueprints/acceptance-test/index.js

@@ -6,6 +6,7 @@ const pathUtil = require('ember-cli-path-utils');
 const stringUtils = require('ember-cli-string-utils');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
@@ -35,7 +36,8 @@ module.exports = useTestFrameworkDetector({
     ].join(' | ');
 
     return {
-      testFolderRoot: testFolderRoot,
+      modulePrefix: modulePrefixForProject(options.project),
+      testFolderRoot,
       friendlyTestName,
       destroyAppExists,
     };

package/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.ts

@@ -1,6 +1,6 @@
 import { describe, it } from 'mocha';
 import { expect } from 'chai';
-import { setupApplicationTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupApplicationTest } from '<%= modulePrefix %>/tests/helpers';
 import { visit, currentURL } from '@ember/test-helpers';
 
 describe('<%= friendlyTestName %>', function () {

package/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.ts

@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { visit, currentURL } from '@ember/test-helpers';
-import { setupApplicationTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupApplicationTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestName %>', function (hooks) {
   setupApplicationTest(hooks);

package/blueprints/component-test/index.js

@@ -7,6 +7,7 @@ const getPathOption = require('ember-cli-get-component-path-option');
 const semver = require('semver');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 function invocationFor(options) {
@@ -81,6 +82,7 @@ module.exports = useTestFrameworkDetector({
     let selfCloseComponent = (descriptor) => `<${descriptor} />`;
 
     return {
+      modulePrefix: modulePrefixForProject(options.project),
       path: getPathOption(options),
       testType: testType,
       componentName,

package/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts

@@ -1,6 +1,6 @@
 <% if (testType === 'integration') { %>import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
@@ -26,7 +26,7 @@ describe('<%= friendlyTestDescription %>', function () {
   });
 });<% } else if (testType === 'unit') { %>import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();

package/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts

@@ -1,5 +1,5 @@
 <% if (testType === 'integration') { %>import { module, test } from 'qunit';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
@@ -24,7 +24,7 @@ module('<%= friendlyTestDescription %>', function (hooks) {
     assert.dom(this.element).hasText('template block text');
   });
 });<% } else if (testType === 'unit') { %>import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);

package/blueprints/controller-test/index.js

@@ -6,6 +6,7 @@ const useTestFrameworkDetector = require('../test-framework-detector');
 const path = require('path');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a controller unit test.',
@@ -22,6 +23,7 @@ module.exports = useTestFrameworkDetector({
     let controllerPathName = dasherizedModuleName;
 
     return {
+      modulePrefix: modulePrefixForProject(options.project),
       controllerPathName: controllerPathName,
       friendlyTestDescription: ['Unit', 'Controller', dasherizedModuleName].join(' | '),
     };

package/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();

package/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);

package/blueprints/helper-test/index.js

@@ -1,10 +1,10 @@
 'use strict';
 
-const stringUtils = require('ember-cli-string-utils');
 const isPackageMissing = require('ember-cli-is-package-missing');
 const semver = require('semver');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
 
@@ -34,15 +34,14 @@ module.exports = useTestFrameworkDetector({
 
   locals: function (options) {
     let friendlyTestName = ['Integration', 'Helper', options.entity.name].join(' | ');
-    let dasherizedModulePrefix = stringUtils.dasherize(options.project.config().modulePrefix);
 
     let hbsImportStatement = this._useNamedHbsImport()
       ? "import { hbs } from 'ember-cli-htmlbars';"
       : "import hbs from 'htmlbars-inline-precompile';";
 
     return {
+      modulePrefix: modulePrefixForProject(options.project),
       friendlyTestName,
-      dasherizedModulePrefix,
       hbsImportStatement,
     };
   },

package/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 

package/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 

package/blueprints/route-test/index.js

@@ -5,6 +5,7 @@ const stringUtil = require('ember-cli-string-utils');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a route unit test.',
@@ -57,6 +58,7 @@ module.exports = useTestFrameworkDetector({
     }
 
     return {
+      modulePrefix: modulePrefixForProject(options.project),
       friendlyTestDescription: ['Unit', 'Route', options.entity.name].join(' | '),
       moduleName: stringUtil.dasherize(moduleName),
     };

package/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();

package/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);

package/blueprints/service-test/index.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
@@ -26,6 +27,7 @@ module.exports = useTestFrameworkDetector({
 
   locals(options) {
     return {
+      modulePrefix: modulePrefixForProject(options.project),
       friendlyTestDescription: ['Unit', 'Service', options.entity.name].join(' | '),
     };
   },

package/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();

package/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);

package/blueprints-js/-addon-import.js

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

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

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

package/blueprints-js/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js

@@ -0,0 +1,13 @@
+import { describe, it } from 'mocha';
+import { expect } from 'chai';
+import { setupApplicationTest } from '<%= modulePrefix %>/tests/helpers';
+import { visit, currentURL } from '@ember/test-helpers';
+
+describe('<%= friendlyTestName %>', function () {
+  setupApplicationTest();
+
+  it('can visit /<%= dasherizedModuleName %>', async function () {
+    await visit('/<%= dasherizedModuleName %>');
+    expect(currentURL()).to.equal('/<%= dasherizedModuleName %>');
+  });
+});

package/blueprints-js/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.strictEqual(currentURL(), '/<%= dasherizedModuleName %>');
+  });
+});

package/blueprints-js/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js

@@ -0,0 +1,13 @@
+import { module, test } from 'qunit';
+import { visit, currentURL } from '@ember/test-helpers';
+import { setupApplicationTest } from '<%= modulePrefix %>/tests/helpers';
+
+module('<%= friendlyTestName %>', function (hooks) {
+  setupApplicationTest(hooks);
+
+  test('visiting /<%= dasherizedModuleName %>', async function (assert) {
+    await visit('/<%= dasherizedModuleName %>');
+
+    assert.strictEqual(currentURL(), '/<%= dasherizedModuleName %>');
+  });
+});

package/blueprints-js/component/files/__root__/__path__/__name__.js

@@ -0,0 +1,3 @@
+<%= importComponent %>
+<%= importTemplate %>
+export default <%= defaultExport %>

package/blueprints-js/component/files/__root__/__templatepath__/__templatename__.hbs

@@ -0,0 +1 @@
+{{yield}}

package/blueprints-js/component-addon/files/__root__/__path__/__name__.js

@@ -0,0 +1 @@
+export { default } from '<%= modulePath %>';

package/blueprints-js/component-class/files/__root__/__path__/__name__.js

@@ -0,0 +1,3 @@
+<%= importComponent %>
+<%= importTemplate %>
+export default <%= defaultExport %>

package/blueprints-js/component-class-addon/files/__root__/__path__/__name__.js

@@ -0,0 +1 @@
+export { default } from '<%= modulePath %>';

package/blueprints-js/component-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js

@@ -0,0 +1,34 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupComponentTest } from 'ember-mocha';<% if (testType === 'integration') { %>
+import hbs from 'htmlbars-inline-precompile';<% } %>
+
+describe('<%= friendlyTestDescription %>', function () {
+  setupComponentTest('<%= componentPathName %>', {
+    <% 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,<% } %>
+  });
+
+  it('renders', function () {
+    <% if (testType === 'integration' ) { %>// Set any properties with this.set('myProperty', 'value');
+    // Handle any actions with this.on('myAction', function(val) { ... });
+
+    this.render(hbs`<%= selfCloseComponent(componentName) %>`);
+    expect(this.$()).to.have.length(1);
+
+    // Template block usage:
+    this.render(hbs`
+      <%= openComponent(componentName) %>
+        template block text
+      <%= closeComponent(componentName) %>
+    `);
+
+    expect(this.$().text().trim()).to.equal('template block text');<% } 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);<% } %>
+  });
+});

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

@@ -0,0 +1,36 @@
+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) { ... });
+
+      this.render(hbs`<%= selfCloseComponent(componentName) %>`);
+      expect(this.$()).to.have.length(1);
+
+      // Template block usage:
+      this.render(hbs`
+        <%= openComponent(componentName) %>
+          template block text
+        <%= closeComponent(componentName) %>
+      `);
+
+      expect(this.$().text().trim()).to.equal('template block text');<% } 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);<% } %>
+    });
+  }
+);

package/blueprints-js/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js

@@ -0,0 +1,38 @@
+<% if (testType === 'integration') { %>import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
+import { render } from '@ember/test-helpers';
+<%= hbsImportStatement %>
+
+describe('<%= friendlyTestDescription %>', function () {
+  setupRenderingTest();
+
+  it('renders', async function () {
+    // Set any properties with this.set('myProperty', 'value');
+    // Handle any actions with this.set('myAction', function(val) { ... });
+
+    await render(hbs`<%= selfCloseComponent(componentName) %>`);
+
+    expect(this.element.textContent.trim()).to.equal('');
+
+    // Template block usage:
+    await render(hbs`
+      <%= openComponent(componentName) %>
+        template block text
+      <%= closeComponent(componentName) %>
+    `);
+
+    expect(this.element.textContent.trim()).to.equal('template block text');
+  });
+});<% } else if (testType === 'unit') { %>import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
+
+describe('<%= friendlyTestDescription %>', function () {
+  setupTest();
+
+  it('exists', function () {
+    let component = this.owner.factoryFor('component:<%= componentPathName %>').create();
+    expect(component).to.be.ok;
+  });
+});<% } %>

package/blueprints-js/component-test/qunit-files/__root__/__testType__/__path__/__test__.js

@@ -0,0 +1,31 @@
+import { moduleForComponent, test } from 'ember-qunit';<% if (testType === 'integration') { %>
+import hbs from 'htmlbars-inline-precompile';<% } %>
+
+moduleForComponent('<%= 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,<% } %>
+});
+
+test('it renders', function (assert) {<% if (testType === 'integration' ) { %>
+  // Set any properties with this.set('myProperty', 'value');
+  // Handle any actions with this.on('myAction', function(val) { ... });
+
+  this.render(hbs`<%= selfCloseComponent(componentName) %>`);
+
+  assert.strictEqual(this.$().text().trim(), '');
+
+  // Template block usage:
+  this.render(hbs`
+    <%= openComponent(componentName) %>
+      template block text
+    <%= closeComponent(componentName) %>
+  `);
+
+  assert.strictEqual(this.$().text().trim(), 'template block text');<% } else if(testType === 'unit') { %>
+  // Creates the component instance
+  /*let component =*/ this.subject();
+  // Renders the component to the page
+  this.render();
+  assert.strictEqual(this.$().text().trim(), '');<% } %>
+});

package/blueprints-js/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js

@@ -0,0 +1,36 @@
+<% if (testType === 'integration') { %>import { module, test } from 'qunit';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
+import { render } from '@ember/test-helpers';
+<%= hbsImportStatement %>
+
+module('<%= friendlyTestDescription %>', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function (assert) {
+    // Set any properties with this.set('myProperty', 'value');
+    // Handle any actions with this.set('myAction', function(val) { ... });
+
+    await render(hbs`<%= selfCloseComponent(componentName) %>`);
+
+    assert.dom(this.element).hasText('');
+
+    // Template block usage:
+    await render(hbs`
+      <%= openComponent(componentName) %>
+        template block text
+      <%= closeComponent(componentName) %>
+    `);
+
+    assert.dom(this.element).hasText('template block text');
+  });
+});<% } else if (testType === 'unit') { %>import { module, test } from 'qunit';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
+
+module('<%= friendlyTestDescription %>', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    let component = this.owner.factoryFor('component:<%= componentPathName %>').create();
+    assert.ok(component);
+  });
+});<% } %>

package/blueprints-js/controller/files/__root__/__path__/__name__.js

@@ -0,0 +1,3 @@
+import Controller from '@ember/controller';
+
+export default class <%= classifiedModuleName %>Controller extends Controller {}

package/blueprints-js/controller-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js

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

package/blueprints-js/controller-test/mocha-files/__root__/__testType__/__path__/__test__.js

@@ -0,0 +1,18 @@
+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 () {
+    // TODO: Replace this with your real tests.
+    it('exists', function () {
+      let controller = this.subject();
+      expect(controller).to.be.ok;
+    });
+  }
+);