Merge pull request #20114 from bertdeblock/fix-generated-import-paths…

…-for-test-setup-functions-in-addons
emberjs · Jun 11, 2022 · 92e79ab · 92e79ab
2 parents 75cd214 + 62a97d5
commit 92e79ab
Show file tree

Hide file tree

Showing 51 changed files with 496 additions and 94 deletions.
diff --git a/blueprints-js/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js b/blueprints-js/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
@@ -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 () {

diff --git a/blueprints-js/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js b/blueprints-js/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
@@ -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);

diff --git a/blueprints-js/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -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();

diff --git a/blueprints-js/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -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);

diff --git a/blueprints-js/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/controller-test/mocha-rfc-232-files/__root__/__testType__/__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();

diff --git a/blueprints-js/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/controller-test/qunit-rfc-232-files/__root__/__testType__/__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);

diff --git a/...-js/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/...-js/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -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 %>
 

diff --git a/...-js/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/...-js/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -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 %>
 

diff --git a/blueprints-js/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/route-test/mocha-rfc-232-files/__root__/__testType__/__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();

diff --git a/blueprints-js/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/route-test/qunit-rfc-232-files/__root__/__testType__/__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);

diff --git a/blueprints-js/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/service-test/mocha-rfc-232-files/__root__/__testType__/__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();

diff --git a/blueprints-js/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/service-test/qunit-rfc-232-files/__root__/__testType__/__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);

diff --git a/blueprints/-utils.js b/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,
+};
diff --git a/blueprints/acceptance-test/index.js b/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,
     };

diff --git a/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.ts b/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 () {

diff --git a/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.ts b/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);

diff --git a/blueprints/component-test/index.js b/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,

diff --git a/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/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();

diff --git a/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/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);

diff --git a/blueprints/controller-test/index.js b/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(' | '),
     };

diff --git a/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/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();

diff --git a/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/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);

diff --git a/blueprints/helper-test/index.js b/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,
     };
   },

diff --git a/...nts/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts b/...nts/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 %>
 

diff --git a/...nts/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts b/...nts/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 %>
 

diff --git a/blueprints/route-test/index.js b/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),
     };

diff --git a/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/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();

diff --git a/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/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);

diff --git a/blueprints/service-test/index.js b/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(' | '),
     };
   },

diff --git a/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/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();

diff --git a/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/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);

diff --git a/node-tests/blueprints/acceptance-test-test.js b/node-tests/blueprints/acceptance-test-test.js
@@ -144,5 +144,23 @@ describe('Blueprint: acceptance-test', function () {
         });
       });
     });
+
+    describe('with ember-mocha@0.16.2', function () {
+      beforeEach(function () {
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
+        generateFakePackageManifest('ember-mocha', '0.16.2');
+      });
+
+      it('acceptance-test foo', function () {
+        return emberGenerateDestroy(['acceptance-test', 'foo'], (_file) => {
+          expect(_file('tests/acceptance/foo-test.js')).to.equal(
+            fixture('acceptance-test/mocha-rfc268-addon.js')
+          );
+        });
+      });
+    });
   });
 });