[BUGFIX release] Fix generated import paths for test setup functions in addons

packages/adapter/blueprints/adapter-test/index.js

@@ -2,6 +2,7 @@ const path = require('path');
 
 const testInfo = require('ember-cli-test-info');
 const useTestFrameworkDetector = require('@ember-data/private-build-infra/src/utilities/test-framework-detector');
+const modulePrefixForProject = require('@ember-data/private-build-infra/src/utilities/module-prefix-for-project');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates an ember-data adapter unit test',
@@ -22,6 +23,7 @@ module.exports = useTestFrameworkDetector({
   locals(options) {
     return {
       friendlyTestDescription: testInfo.description(options.entity.name, 'Unit', 'Adapter'),
+      modulePrefix: modulePrefixForProject(options.project),
     };
   },
 });

packages/adapter/blueprints/adapter-test/mocha-rfc-232-files/__root__/__path__/__test__.js

@@ -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();

packages/adapter/blueprints/adapter-test/qunit-files/__root__/__path__/__test__.js

@@ -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);

packages/adapter/node-tests/blueprints/adapter-test.js

@@ -266,4 +266,36 @@ describe('Acceptance: generate and destroy adapter blueprints', function () {
       });
     });
   });
+
+  describe('in addon', function () {
+    beforeEach(function () {
+      return emberNew({ target: 'addon' });
+    });
+
+    describe('with ember-qunit (default)', function () {
+      it('adapter-test foo', function () {
+        return emberGenerateDestroy(['adapter-test', 'foo'], (_file) => {
+          expect(_file('tests/unit/adapters/foo-test.js')).to.equal(fixture(__dirname, 'adapter-test/rfc232-addon.js'));
+        });
+      });
+    });
+
+    describe('with ember-mocha', function () {
+      beforeEach(function () {
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
+        generateFakePackageManifest('ember-mocha', '0.16.2');
+      });
+
+      it('adapter-test foo', function () {
+        return emberGenerateDestroy(['adapter-test', 'foo'], (_file) => {
+          expect(_file('tests/unit/adapters/foo-test.js')).to.equal(
+            fixture(__dirname, 'adapter-test/mocha-rfc232-addon.js')
+          );
+        });
+      });
+    });
+  });
 });

packages/adapter/node-tests/fixtures/adapter-test/mocha-rfc232-addon.js

@@ -0,0 +1,13 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'dummy/tests/helpers';
+
+describe('Unit | Adapter | foo', function() {
+  setupTest();
+
+  // Replace this with your real tests.
+  it('exists', function() {
+    let adapter = this.owner.lookup('adapter:foo');
+    expect(adapter).to.be.ok;
+  });
+});

packages/adapter/node-tests/fixtures/adapter-test/rfc232-addon.js

@@ -0,0 +1,12 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'dummy/tests/helpers';
+
+module('Unit | Adapter | foo', function(hooks) {
+  setupTest(hooks);
+
+  // Replace this with your real tests.
+  test('it exists', function(assert) {
+    let adapter = this.owner.lookup('adapter:foo');
+    assert.ok(adapter);
+  });
+});

packages/model/blueprints/model-test/index.js

@@ -2,6 +2,7 @@ const path = require('path');
 
 const testInfo = require('ember-cli-test-info');
 const useTestFrameworkDetector = require('@ember-data/private-build-infra/src/utilities/test-framework-detector');
+const modulePrefixForProject = require('@ember-data/private-build-infra/src/utilities/module-prefix-for-project');
 
 const ModelBlueprint = require('../model');
 
@@ -25,6 +26,7 @@ module.exports = useTestFrameworkDetector({
     const result = ModelBlueprint.locals.apply(this, arguments);
 
     result.friendlyTestDescription = testInfo.description(options.entity.name, 'Unit', 'Model');
+    result.modulePrefix = modulePrefixForProject(options.project);
 
     return result;
   },

packages/model/blueprints/model-test/mocha-rfc-232-files/__root__/__path__/__test__.js

@@ -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();

packages/model/blueprints/model-test/qunit-files/__root__/__path__/__test__.js

@@ -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);

packages/model/node-tests/blueprints/model-test.js

@@ -298,4 +298,36 @@ describe('Acceptance: generate and destroy model blueprints', function () {
       });
     });
   });
+
+  describe('in addon', function () {
+    beforeEach(function () {
+      return emberNew({ target: 'addon' });
+    });
+
+    describe('with ember-qunit (default)', function () {
+      it('model-test foo', function () {
+        return emberGenerateDestroy(['model-test', 'foo'], (_file) => {
+          expect(_file('tests/unit/models/foo-test.js')).to.equal(fixture(__dirname, 'model-test/rfc232-addon.js'));
+        });
+      });
+    });
+
+    describe('with ember-mocha', function () {
+      beforeEach(function () {
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
+        generateFakePackageManifest('ember-mocha', '0.16.2');
+      });
+
+      it('model-test foo', function () {
+        return emberGenerateDestroy(['model-test', 'foo'], (_file) => {
+          expect(_file('tests/unit/models/foo-test.js')).to.equal(
+            fixture(__dirname, 'model-test/mocha-rfc232-addon.js')
+          );
+        });
+      });
+    });
+  });
 });

packages/model/node-tests/fixtures/model-test/mocha-rfc232-addon.js

@@ -0,0 +1,14 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'dummy/tests/helpers';
+
+describe('Unit | Model | foo', function() {
+  setupTest();
+
+  // Replace this with your real tests.
+  it('exists', function() {
+    let store = this.owner.lookup('service:store');
+    let model = store.createRecord('foo', {});
+    expect(model).to.be.ok;
+  });
+});

packages/model/node-tests/fixtures/model-test/rfc232-addon.js

@@ -0,0 +1,13 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'dummy/tests/helpers';
+
+module('Unit | Model | foo', function(hooks) {
+  setupTest(hooks);
+
+  // Replace this with your real tests.
+  test('it exists', function(assert) {
+    let store = this.owner.lookup('service:store');
+    let model = store.createRecord('foo', {});
+    assert.ok(model);
+  });
+});

packages/private-build-infra/src/utilities/module-prefix-for-project.js

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

packages/serializer/blueprints/serializer-test/index.js

@@ -2,6 +2,7 @@ const path = require('path');
 
 const testInfo = require('ember-cli-test-info');
 const useTestFrameworkDetector = require('@ember-data/private-build-infra/src/utilities/test-framework-detector');
+const modulePrefixForProject = require('@ember-data/private-build-infra/src/utilities/module-prefix-for-project');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a serializer unit test.',
@@ -22,6 +23,7 @@ module.exports = useTestFrameworkDetector({
   locals(options) {
     return {
       friendlyTestDescription: testInfo.description(options.entity.name, 'Unit', 'Serializer'),
+      modulePrefix: modulePrefixForProject(options.project),
     };
   },
 });

packages/serializer/blueprints/serializer-test/mocha-rfc-232-files/__root__/__path__/__test__.js

@@ -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();

packages/serializer/blueprints/serializer-test/qunit-files/__root__/__path__/__test__.js

@@ -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);

packages/serializer/blueprints/transform-test/index.js

@@ -2,6 +2,7 @@ const path = require('path');
 
 const testInfo = require('ember-cli-test-info');
 const useTestFrameworkDetector = require('@ember-data/private-build-infra/src/utilities/test-framework-detector');
+const modulePrefixForProject = require('@ember-data/private-build-infra/src/utilities/module-prefix-for-project');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a transform unit test.',
@@ -22,6 +23,7 @@ module.exports = useTestFrameworkDetector({
   locals(options) {
     return {
       friendlyTestDescription: testInfo.description(options.entity.name, 'Unit', 'Transform'),
+      modulePrefix: modulePrefixForProject(options.project),
     };
   },
 });

packages/serializer/blueprints/transform-test/mocha-rfc-232-files/__root__/__path__/__test__.js

@@ -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();

packages/serializer/blueprints/transform-test/qunit-files/__root__/__path__/__test__.js

@@ -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);

packages/serializer/node-tests/blueprints/serializer-test.js

@@ -281,4 +281,38 @@ describe('Acceptance: generate and destroy serializer blueprints', function () {
       });
     });
   });
+
+  describe('in addon', function () {
+    beforeEach(function () {
+      return emberNew({ target: 'addon' });
+    });
+
+    describe('with ember-qunit (default)', function () {
+      it('serializer-test foo', function () {
+        return emberGenerateDestroy(['serializer-test', 'foo'], (_file) => {
+          expect(_file('tests/unit/serializers/foo-test.js')).to.equal(
+            fixture(__dirname, 'serializer-test/rfc232-addon.js')
+          );
+        });
+      });
+    });
+
+    describe('with ember-mocha', function () {
+      beforeEach(function () {
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
+        generateFakePackageManifest('ember-mocha', '0.16.2');
+      });
+
+      it('serializer-test foo', function () {
+        return emberGenerateDestroy(['serializer-test', 'foo'], (_file) => {
+          expect(_file('tests/unit/serializers/foo-test.js')).to.equal(
+            fixture(__dirname, 'serializer-test/mocha-rfc232-addon.js')
+          );
+        });
+      });
+    });
+  });
 });

packages/serializer/node-tests/blueprints/transform-test.js

@@ -195,4 +195,38 @@ describe('Acceptance: generate and destroy transform blueprints', function () {
       });
     });
   });
+
+  describe('in addon', function () {
+    beforeEach(function () {
+      return emberNew({ target: 'addon' });
+    });
+
+    describe('with ember-qunit (default)', function () {
+      it('transform-test foo', function () {
+        return emberGenerateDestroy(['transform-test', 'foo'], (_file) => {
+          expect(_file('tests/unit/transforms/foo-test.js')).to.equal(
+            fixture(__dirname, 'transform-test/rfc232-addon.js')
+          );
+        });
+      });
+    });
+
+    describe('with ember-mocha', function () {
+      beforeEach(function () {
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
+        generateFakePackageManifest('ember-mocha', '0.16.2');
+      });
+
+      it('transform-test foo', function () {
+        return emberGenerateDestroy(['transform-test', 'foo'], (_file) => {
+          expect(_file('tests/unit/transforms/foo-test.js')).to.equal(
+            fixture(__dirname, 'transform-test/mocha-rfc232-addon.js')
+          );
+        });
+      });
+    });
+  });
 });

packages/serializer/node-tests/fixtures/serializer-test/mocha-rfc232-addon.js

@@ -0,0 +1,24 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'dummy/tests/helpers';
+
+describe('Unit | Serializer | foo', function() {
+  setupTest();
+
+  // Replace this with your real tests.
+  it('exists', function() {
+    let store = this.owner.lookup('service:store');
+    let serializer = store.serializerFor('foo');
+
+    expect(serializer).to.be.ok;
+  });
+
+  it('serializes records', function() {
+    let store = this.owner.lookup('service:store');
+    let record = store.createRecord('foo', {});
+
+    let serializedRecord = record.serialize();
+
+    expect(serializedRecord).to.be.ok;
+  });
+});

packages/serializer/node-tests/fixtures/serializer-test/rfc232-addon.js

@@ -0,0 +1,23 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'dummy/tests/helpers';
+
+module('Unit | Serializer | foo', function(hooks) {
+  setupTest(hooks);
+
+  // Replace this with your real tests.
+  test('it exists', function(assert) {
+    let store = this.owner.lookup('service:store');
+    let serializer = store.serializerFor('foo');
+
+    assert.ok(serializer);
+  });
+
+  test('it serializes records', function(assert) {
+    let store = this.owner.lookup('service:store');
+    let record = store.createRecord('foo', {});
+
+    let serializedRecord = record.serialize();
+
+    assert.ok(serializedRecord);
+  });
+});