Merge pull request #62 from bertdeblock/fix-test-helpers-import-path

Fix test helpers import path

Author: bertdeblock

src/generator.ts

@@ -1,10 +1,10 @@
 import { camelCase, pascalCase, pathCase } from "change-case";
 import consola from "consola";
-import { ensureDir, readJson } from "fs-extra/esm";
+import { ensureDir, pathExists, readJson } from "fs-extra/esm";
 import Handlebars from "handlebars";
 import { readFile, writeFile } from "node:fs/promises";
 import { dirname, join, relative } from "node:path";
-import { cwd, stdout } from "node:process";
+import { cwd } from "node:process";
 import { fileURLToPath } from "node:url";
 import { resolveConfig, type Config } from "./config.js";
 import { FileReference } from "./file-reference.js";
@@ -117,10 +117,17 @@ export function defineGenerator({
         signature: entityNameCases.pascal + "Signature",
       },
       package: packageJson,
+      testHelpersImportPath:
+        (await pathExists(join(packagePath, "tests", "helpers.js"))) ||
+        (await pathExists(join(packagePath, "tests", "helpers.ts")))
+          ? `${packageJson.name}/tests/helpers`
+          : "ember-qunit",
     });
 
     if (resolvedArgs.log) {
-      const border = "─".repeat(stdout.columns ? stdout.columns / 2 : 120);
+      const border = "─".repeat(
+        Math.max(...templateCompiled.split("\n").map((line) => line.length)),
+      );
 
       consola.log(border);
       consola.log("");

templates/component-test/component-test.gjs

@@ -1,7 +1,7 @@
 import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import {{name.pascal}} from '{{package.name}}/components/{{name.path}}';
-import { setupRenderingTest } from '{{package.name}}/tests/helpers';
+import { setupRenderingTest } from '{{testHelpersImportPath}}';
 
 module('Integration | Component | {{name.pascal}}', function (hooks) {
   setupRenderingTest(hooks);

templates/component-test/component-test.gts

@@ -1,7 +1,7 @@
 import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import {{name.pascal}} from '{{package.name}}/components/{{name.path}}';
-import { setupRenderingTest } from '{{package.name}}/tests/helpers';
+import { setupRenderingTest } from '{{testHelpersImportPath}}';
 
 module('Integration | Component | {{name.pascal}}', function (hooks) {
   setupRenderingTest(hooks);

templates/helper-test/helper-test.gjs

@@ -1,6 +1,6 @@
 import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
-import { setupRenderingTest } from '{{package.name}}/tests/helpers';
+import { setupRenderingTest } from '{{testHelpersImportPath}}';
 
 module('Integration | Helper | {{name.camel}}', function (hooks) {
   setupRenderingTest(hooks);

templates/helper-test/helper-test.gts

@@ -1,6 +1,6 @@
 import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
-import { setupRenderingTest } from '{{package.name}}/tests/helpers';
+import { setupRenderingTest } from '{{testHelpersImportPath}}';
 
 module('Integration | Helper | {{name.camel}}', function (hooks) {
   setupRenderingTest(hooks);

templates/modifier-test/modifier-test.gjs

@@ -1,6 +1,6 @@
 import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
-import { setupRenderingTest } from '{{package.name}}/tests/helpers';
+import { setupRenderingTest } from '{{testHelpersImportPath}}';
 
 module('Integration | Modifier | {{name.camel}}', function (hooks) {
   setupRenderingTest(hooks);

templates/modifier-test/modifier-test.gts

@@ -1,6 +1,6 @@
 import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
-import { setupRenderingTest } from '{{package.name}}/tests/helpers';
+import { setupRenderingTest } from '{{testHelpersImportPath}}';
 
 module('Integration | Modifier | {{name.camel}}', function (hooks) {
   setupRenderingTest(hooks);

templates/service-test/service-test.js

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from '{{package.name}}/tests/helpers';
+import { setupTest } from '{{testHelpersImportPath}}';
 
 module('Unit | Service | {{name.pascal}}', function (hooks) {
   setupTest(hooks);

templates/service-test/service-test.ts

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from '{{package.name}}/tests/helpers';
+import { setupTest } from '{{testHelpersImportPath}}';
 
 module('Unit | Service | {{name.pascal}}', function (hooks) {
   setupTest(hooks);

test/__snapshots__/support.test.ts.snap

@@ -15,6 +15,34 @@ exports[`supports v2 addons 1`] = `
 "
 `;
 
+exports[`supports v2 addons 2`] = `
+"import { render } from '@ember/test-helpers';
+import { module, test } from 'qunit';
+import Foo from 'v2-addon/components/foo';
+import { setupRenderingTest } from 'ember-qunit';
+
+module('Integration | Component | Foo', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function (assert) {
+    await render(<template><Foo /></template>);
+
+    assert.dom().hasText('');
+
+    await render(
+      <template>
+        <Foo>
+          template block text
+        </Foo>
+      </template>
+    );
+
+    assert.dom().hasText('template block text');
+  });
+});
+"
+`;
+
 exports[`supports v2 apps 1`] = `
 "<template>{{yield}}</template>
 "