Skip to content

Commit ec8889a

Browse files
committed
Be certain that the vitest environment is not trolling our tests -- and fix @glimmer/env support by adding babel-plugin-debug-macros
1 parent 886c552 commit ec8889a

3 files changed

Lines changed: 38 additions & 6 deletions

File tree

files/babel.config.cjs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* (and linting)
55
*/
66
const { buildMacros } = require('@embroider/macros/babel');
7+
const debugMacros = require('babel-plugin-debug-macros');
78

89
const {
910
babelCompatSupport,
@@ -42,6 +43,22 @@ module.exports = {
4243
},
4344
],
4445
...(isCompat ? babelCompatSupport() : macros.babelMacros),
46+
// Can be removed if @glimmer/env isn't used in this project's dependency graph.
47+
[
48+
debugMacros,
49+
{
50+
flags: [
51+
{
52+
source: '@glimmer/env',
53+
flags: {
54+
DEBUG: true,
55+
CI: false,
56+
},
57+
},
58+
],
59+
},
60+
'@glimmer/env stripping',
61+
],
4562
],
4663

4764
generatorOpts: {

files/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
"@ember/library-tsconfig": "^1.0.0",<% } %>
5555
"@rollup/plugin-babel": "^6.0.4",<% if (typescript) { %>
5656
"@types/qunit": "^2.19.12",<% } %>
57+
"babel-plugin-debug-macros": "^1.0.2",
5758
"babel-plugin-ember-template-compilation": "^2.2.5",
5859
"concurrently": "^9.0.1",
5960
"ember-qunit": "^9.0.2",

tests/smoke-tests/defaults.test.ts

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ for (let packageManager of SUPPORTED_PACKAGE_MANAGERS) {
3636
addonDir = join(tmpDir, addonName);
3737
await execa({
3838
cwd: tmpDir,
39+
extendEnv: false,
3940
})`${localEmberCli} addon ${addonName} -b ${blueprintPath} --skip-npm --skip-git --prefer-local true --${packageManager}`;
40-
await execa({ cwd: addonDir })`${packageManager} install`;
41+
await execa({ cwd: addonDir, extendEnv: false })`${packageManager} install`;
4142
});
4243

4344
it('is using the correct packager', async () => {
@@ -97,13 +98,16 @@ for (let packageManager of SUPPORTED_PACKAGE_MANAGERS) {
9798
// Tests are additive, so when running them in order, we want to check linting
9899
// before we add files from fixtures
99100
it('lints with no fixtures all pass', async () => {
100-
let { exitCode } = await execa({ cwd: addonDir })`pnpm lint`;
101+
let { exitCode } = await execa({ cwd: addonDir, extendEnv: false })`pnpm lint`;
101102

102103
expect(exitCode).toEqual(0);
103104
});
104105

105106
it('lint:fix with no fixtures', async () => {
106-
let { exitCode } = await execa({ cwd: addonDir })`${packageManager} run lint:fix`;
107+
let { exitCode } = await execa({
108+
cwd: addonDir,
109+
extendEnv: false,
110+
})`${packageManager} run lint:fix`;
107111

108112
expect(exitCode).toEqual(0);
109113
});
@@ -123,13 +127,19 @@ for (let packageManager of SUPPORTED_PACKAGE_MANAGERS) {
123127
});
124128

125129
it('lint:fix', async () => {
126-
let { exitCode } = await execa({ cwd: addonDir })`${packageManager} run lint:fix`;
130+
let { exitCode } = await execa({
131+
cwd: addonDir,
132+
extendEnv: false,
133+
})`${packageManager} run lint:fix`;
127134

128135
expect(exitCode).toEqual(0);
129136
});
130137

131138
it('build', async () => {
132-
let buildResult = await execa({ cwd: addonDir })`${packageManager} run build`;
139+
let buildResult = await execa({
140+
cwd: addonDir,
141+
extendEnv: false,
142+
})`${packageManager} run build`;
133143

134144
expect(buildResult.exitCode).toEqual(0);
135145

@@ -142,7 +152,11 @@ for (let packageManager of SUPPORTED_PACKAGE_MANAGERS) {
142152
// It's important that we ensure that dist directory is empty for this test, because
143153
await fs.rm(join(addonDir, 'dist'), { recursive: true, force: true });
144154

145-
let testResult = await execa({ cwd: addonDir })`${packageManager} run test`;
155+
console.log('in vitest', process.env.NODE_ENV, process.env.CI);
156+
let testResult = await execa({
157+
cwd: addonDir,
158+
extendEnv: false,
159+
})`${packageManager} run test`;
146160

147161
expect(testResult.exitCode).toEqual(0);
148162

0 commit comments

Comments
 (0)