Skip to content

Commit 4db9136

Browse files
authored
Merge pull request #21054 from emberjs/gjs-test-support
Template tag support in ember's test suite
2 parents ac30a8a + 6a79cdb commit 4db9136

File tree

6 files changed

+67
-86
lines changed

6 files changed

+67
-86
lines changed

index.html

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,25 +61,28 @@
6161

6262
<script type="module">
6363
// tests in internal packages
64-
import.meta.glob('./packages/@ember/-internals/*/tests/**/*.{js,ts}', {
64+
import.meta.glob('./packages/@ember/-internals/*/tests/**/*.{js,ts,gjs,gts}', {
6565
eager: true,
6666
});
6767

6868
// tests in scoped packages
69-
import.meta.glob('./packages/*/*/tests/**/*.{js,ts}', {
69+
import.meta.glob('./packages/*/*/tests/**/*.{js,ts,gjs,gts}', {
7070
eager: true,
7171
});
7272

7373
// tests in non-scoped packages
74-
import.meta.glob('./packages/*/tests/**/*.{js,ts}', {
74+
import.meta.glob('./packages/*/tests/**/*.{js,ts,gjs,gts}', {
7575
eager: true,
7676
});
7777

7878
// packages originally authored in glimmer-vm repo have a different test
7979
// naming convention
80-
import.meta.glob('./packages/{@glimmer,@glimmer-workspace}/*/test/**/*-test.{js,ts}', {
81-
eager: true,
82-
});
80+
import.meta.glob(
81+
'./packages/{@glimmer,@glimmer-workspace}/*/test/**/*-test.{js,ts,gjs,gts}',
82+
{
83+
eager: true,
84+
}
85+
);
8386
</script>
8487

8588
<div id="qunit"></div>

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
"@babel/types": "^7.22.5",
9696
"@embroider/macros": "^1.18.0",
9797
"@embroider/shared-internals": "^2.5.0",
98+
"@embroider/vite": "^1.1.5",
9899
"@eslint/js": "^9.21.0",
99100
"@glimmer/component": "workspace:*",
100101
"@rollup/plugin-babel": "^6.0.4",
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import { RenderingTestCase, moduleFor } from 'internal-test-helpers';
2+
import { Helper } from '../../index';
3+
4+
moduleFor(
5+
'Custom Helper test',
6+
class extends RenderingTestCase {
7+
['@test works with strict-mode']() {
8+
class Custom extends Helper {
9+
compute([value]) {
10+
return `${value}-custom`;
11+
}
12+
}
13+
14+
let TestComponent = <template>{{ (Custom 'my-test') }}</template>
15+
this.render(`<this.TestComponent />`, { TestComponent });
16+
this.assertText('my-test-custom');
17+
this.assertStableRerender();
18+
}
19+
}
20+
);

packages/@ember/-internals/glimmer/tests/integration/custom-helper-test.js

Lines changed: 0 additions & 78 deletions
This file was deleted.

pnpm-lock.yaml

Lines changed: 34 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vite.config.mjs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
exposedDependencies,
1212
hiddenDependencies,
1313
} from './rollup.config.mjs';
14+
import { templateTag } from '@embroider/vite';
1415

1516
const require = createRequire(import.meta.url);
1617
const projectRoot = dirname(fileURLToPath(import.meta.url));
@@ -32,9 +33,10 @@ export default defineConfig(({ mode }) => {
3233

3334
return {
3435
plugins: [
36+
templateTag(),
3537
babel({
3638
babelHelpers: 'bundled',
37-
extensions: ['.js', '.ts'],
39+
extensions: ['.js', '.ts', '.gjs', '.gts'],
3840
configFile: resolve(dirname(fileURLToPath(import.meta.url)), './babel.test.config.mjs'),
3941
}),
4042
resolvePackages(

0 commit comments

Comments
 (0)