Skip to content

fix(test): isolate runtime worktree env fixtures #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bouillipx wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(test): isolate runtime worktree env fixtures #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion packages/api/test/install-script-test-helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,23 @@ const repoRoot = resolve(testDir, '..', '..', '..');

export const installScript = resolve(repoRoot, 'scripts', 'install.sh');

const INSTALL_TEST_ENV_KEYS = [
'CAT_CAFE_GLOBAL_CONFIG_ROOT',
'CAT_CAFE_RUNTIME_BRANCH',
'CAT_CAFE_RUNTIME_DIR',
'CAT_CAFE_RUNTIME_REMOTE',
'CAT_CAFE_RUNTIME_ROOT',
'CAT_CAFE_WORKSPACE_ROOT',
];

function withInstallTestEnv(overrides = {}) {
const env = { ...process.env };
for (const key of INSTALL_TEST_ENV_KEYS) {
delete env[key];
}
return { ...env, ...overrides };
}

export {
assert,
basename,
Expand All @@ -39,7 +56,7 @@ export function runSourceOnlySnippet(snippet) {
const result = spawnSync(
'bash',
['-lc', `set -e\nsource "${installScript}" --source-only >/dev/null 2>&1\n${snippet}`],
{ encoding: 'utf8' },
{ encoding: 'utf8', env: withInstallTestEnv() },
);

assert.equal(
Expand Down
55 changes: 33 additions & 22 deletions packages/api/test/runtime-worktree-script.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,22 @@ const tempProcs = [];

process.env.CAT_CAFE_SKIP_NODE_RUNTIME_GUARD = '1';

const RUNTIME_WORKTREE_TEST_ENV_KEYS = [
'CAT_CAFE_RUNTIME_BRANCH',
'CAT_CAFE_RUNTIME_DIR',
'CAT_CAFE_RUNTIME_REMOTE',
'CAT_CAFE_RUNTIME_ROOT',
'CAT_CAFE_WORKSPACE_ROOT',
];

function withRuntimeWorktreeTestEnv(overrides = {}) {
const env = { ...process.env };
for (const key of RUNTIME_WORKTREE_TEST_ENV_KEYS) {
delete env[key];
}
return { ...env, CAT_CAFE_SKIP_NODE_RUNTIME_GUARD: '1', ...overrides };
}

function createTempProject(name) {
const projectDir = mkdtempSync(join(tmpdir(), `${name}-`));
tempDirs.push(projectDir);
Expand Down Expand Up @@ -150,12 +166,11 @@ exit 0

function withStubbedPnpmEnv(projectDir, options = {}) {
const { binDir, logFile } = createPnpmStub(projectDir, options);
return {
...process.env,
return withRuntimeWorktreeTestEnv({
CAT_CAFE_RUNTIME_RESTART_OK: '1',
PATH: `${binDir}:${process.env.PATH}`,
RUNTIME_TEST_PNPM_LOG: logFile,
};
});
}

function seedRuntimeDependencyMarkers(projectDir) {
Expand Down Expand Up @@ -321,7 +336,7 @@ printf 'ok'`,
const result = spawnSync('bash', [join(projectDir, 'scripts', 'runtime-worktree.sh'), 'start', '--no-sync'], {
cwd: projectDir,
encoding: 'utf8',
env: { ...process.env, CAT_CAFE_RUNTIME_RESTART_OK: '1' },
env: withRuntimeWorktreeTestEnv({ CAT_CAFE_RUNTIME_RESTART_OK: '1' }),
});

assert.equal(result.status, 0);
Expand Down Expand Up @@ -354,7 +369,7 @@ server.listen(3010,'127.0.0.1',()=>setInterval(()=>{},1000));`,
const result = spawnSync('bash', [join(projectDir, 'scripts', 'runtime-worktree.sh'), 'start', '--no-sync'], {
cwd: projectDir,
encoding: 'utf8',
env: { ...process.env, CAT_CAFE_RUNTIME_RESTART_OK: '1' },
env: withRuntimeWorktreeTestEnv({ CAT_CAFE_RUNTIME_RESTART_OK: '1' }),
});

assert.equal(result.status, 0, `exit=${result.status}\nstdout:\n${result.stdout}\nstderr:\n${result.stderr}`);
Expand Down Expand Up @@ -396,6 +411,7 @@ server.listen(3010,'127.0.0.1',()=>setInterval(()=>{},1000));`,
{
cwd: projectDir,
encoding: 'utf8',
env: withRuntimeWorktreeTestEnv(),
},
);

Expand All @@ -416,7 +432,7 @@ server.listen(3010,'127.0.0.1',()=>setInterval(()=>{},1000));`,
const result = spawnSync('bash', [join(projectDir, 'scripts', 'runtime-worktree.sh'), 'start', '--no-sync'], {
cwd: projectDir,
encoding: 'utf8',
env: { ...process.env, CAT_CAFE_RUNTIME_RESTART_OK: '1' },
env: withRuntimeWorktreeTestEnv({ CAT_CAFE_RUNTIME_RESTART_OK: '1' }),
});

assert.notEqual(result.status, 0);
Expand Down Expand Up @@ -624,7 +640,7 @@ server.listen(3010,'127.0.0.1',()=>setInterval(()=>{},1000));`,
const result = spawnSync('bash', [join(projectDir, 'scripts', 'runtime-worktree.sh'), 'start', '--no-sync'], {
cwd: projectDir,
encoding: 'utf8',
env: { ...process.env, CAT_CAFE_RUNTIME_RESTART_OK: '1' },
env: withRuntimeWorktreeTestEnv({ CAT_CAFE_RUNTIME_RESTART_OK: '1' }),
});

assert.equal(result.status, 0, `exit=${result.status}\nstdout:\n${result.stdout}\nstderr:\n${result.stderr}`);
Expand Down Expand Up @@ -652,12 +668,11 @@ server.listen(3002,'127.0.0.1',()=>setInterval(()=>{},1000));`,
tempProcs.push(server);
await waitForLocalPort(3002);

const ncFallbackEnv = {
...process.env,
const ncFallbackEnv = withRuntimeWorktreeTestEnv({
API_SERVER_PORT: '3002',
PATH: `${binDir}:${process.env.PATH}`,
RUNTIME_TEST_PNPM_LOG: logFile,
};
});
// Ensure CAT_CAFE_RUNTIME_RESTART_OK is not inherited from the parent env;
// this test specifically validates that restart is REFUSED when the API port is active.
delete ncFallbackEnv.CAT_CAFE_RUNTIME_RESTART_OK;
Expand Down Expand Up @@ -691,10 +706,9 @@ server.listen(3010,'127.0.0.1',()=>setInterval(()=>{},1000));`,
tempProcs.push(server);
await waitForLocalPort(3010);

const envFilePortEnv = {
...process.env,
const envFilePortEnv = withRuntimeWorktreeTestEnv({
CAT_CAFE_RUNTIME_DIR: projectDir,
};
});
// Ensure CAT_CAFE_RUNTIME_RESTART_OK is not inherited from the parent env;
// this test validates that restart is REFUSED when .env API_SERVER_PORT is active.
delete envFilePortEnv.CAT_CAFE_RUNTIME_RESTART_OK;
Expand Down Expand Up @@ -837,11 +851,10 @@ server.listen(3010,'127.0.0.1',()=>setInterval(()=>{},1000));`,
const result = spawnSync('bash', [join(projectDir, 'scripts', 'runtime-worktree.sh'), 'start', '--no-install'], {
cwd: projectDir,
encoding: 'utf8',
env: {
...process.env,
env: withRuntimeWorktreeTestEnv({
CAT_CAFE_RUNTIME_DIR: normalizedRuntimeDir,
API_SERVER_PORT: '19899',
},
}),
});

assert.notEqual(result.status, 0);
Expand Down Expand Up @@ -884,11 +897,10 @@ server.listen(3010,'127.0.0.1',()=>setInterval(()=>{},1000));`,
const result = spawnSync('bash', [join(projectDir, 'scripts', 'runtime-worktree.sh'), 'start', '--no-install'], {
cwd: projectDir,
encoding: 'utf8',
env: {
...process.env,
env: withRuntimeWorktreeTestEnv({
CAT_CAFE_RUNTIME_DIR: normalizedRuntimeDir,
API_SERVER_PORT: '19899',
},
}),
});

assert.notEqual(result.status, 0);
Expand Down Expand Up @@ -933,11 +945,10 @@ server.listen(3010,'127.0.0.1',()=>setInterval(()=>{},1000));`,
const result = spawnSync('bash', [join(projectDir, 'scripts', 'runtime-worktree.sh'), 'start', '--no-install'], {
cwd: projectDir,
encoding: 'utf8',
env: {
...process.env,
env: withRuntimeWorktreeTestEnv({
CAT_CAFE_RUNTIME_DIR: normalizedRuntimeDir,
API_SERVER_PORT: '19899',
},
}),
});

assert.notEqual(result.status, 0);
Expand Down