Skip to content

Commit 8a895fd

Browse files
committed
all tests pass
1 parent 2c4a31b commit 8a895fd

3 files changed

Lines changed: 22 additions & 12 deletions

File tree

pnpm-lock.yaml

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

tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"@vitest/ui": "^0.18.0",
1111
"c8": "^7.11.3",
1212
"ember-cli": "github:ember-cli/ember-cli#master",
13-
"execa": "^9.5.2",
13+
"execa": "^9.6.0",
1414
"fixturify": "^3.0.0",
1515
"fs-extra": "^10.0.0",
1616
"globby": "^14.1.0",

tests/smoke-tests/defaults.test.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,20 @@ for (let packageManager of SUPPORTED_PACKAGE_MANAGERS) {
152152
// It's important that we ensure that dist directory is empty for this test, because
153153
await fs.rm(join(addonDir, 'dist'), { recursive: true, force: true });
154154

155-
console.log('in vitest', process.env.NODE_ENV, process.env.CI);
155+
let safeEnv = { ...process.env };
156+
for (let key of Object.keys(safeEnv)) {
157+
if (key.startsWith('EMBER_') || key.startsWith('VITE_') || key.startsWith('NODE_')) {
158+
delete safeEnv[key];
159+
}
160+
}
161+
156162
let testResult = await execa({
157163
cwd: addonDir,
158164
extendEnv: false,
165+
// a modified env required with extendEnv, else we still inherit/merge the env of vitest
166+
// which overrides our NODE_ENV from our .env.development file (read by vite)
167+
// (because in-shell ENV vars override .env files)
168+
env: safeEnv,
159169
})`${packageManager} run test`;
160170

161171
expect(testResult.exitCode).toEqual(0);

0 commit comments

Comments
 (0)