Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/generator.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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("");
Expand Down
2 changes: 1 addition & 1 deletion templates/component-test/component-test.gjs
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion templates/component-test/component-test.gts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion templates/helper-test/helper-test.gjs
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion templates/helper-test/helper-test.gts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion templates/modifier-test/modifier-test.gjs
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion templates/modifier-test/modifier-test.gts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion templates/service-test/service-test.js
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion templates/service-test/service-test.ts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
28 changes: 28 additions & 0 deletions test/__snapshots__/support.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -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>
"
Expand Down
4 changes: 4 additions & 0 deletions test/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ export class Package {
return readFile(join(this.path, path), "utf-8");
}

async remove(path: string): Promise<void> {
await remove(join(this.path, path));
}

static async create(name: string, path: string = uuidv4()): Promise<Package> {
const pkg = new this(join("test", "output", path));

Expand Down
Empty file.
9 changes: 6 additions & 3 deletions test/support.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,12 @@ it("supports v1 addons", async (ctx) => {
it("supports v2 addons", async (ctx) => {
pkg = await Package.create("v2-addon");

await pkg.remove("tests/helpers.ts");
await pkg.gember("component", "foo");
await pkg.gember("component-test", "foo");

const content = await pkg.readFile("src/components/foo.gjs");

ctx.expect(content).toMatchSnapshot();
ctx.expect(await pkg.readFile("src/components/foo.gjs")).toMatchSnapshot();
ctx
.expect(await pkg.readFile("tests/integration/components/foo-test.gjs"))
.toMatchSnapshot();
});
Loading