Skip to content

[FIX] Properly pass headless settings to testing framework #67

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

Merged
Avni2000 merged 2 commits into from
Feb 10, 2026
Merged

[FIX] Properly pass headless settings to testing framework #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6db77d
[FIX] Properly pass headless settings to testing framework
Avni2000 Feb 10, 2026
8736b27
Merge branch 'improve-diffs' into respect-settings
Avni2000 Feb 10, 2026
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
28 changes: 21 additions & 7 deletions src/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,30 @@ export function getSettings(): MergeNBSettings {
return { ...DEFAULT_SETTINGS };
}

if (process.env.MERGENB_TEST_MODE === 'true') {
return { ...DEFAULT_SETTINGS };
}

const defaults: MergeNBSettings = {
autoResolveExecutionCount: true,
autoResolveKernelVersion: true,
stripOutputs: true,
autoResolveWhitespace: true,
hideNonConflictOutputs: true,
enableUndoRedoHotkeys: true,
showBaseColumn: false,
};

const config = vscode.workspace.getConfiguration('mergeNB');

return {
autoResolveExecutionCount: config.get<boolean>('autoResolve.executionCount', true),
autoResolveKernelVersion: config.get<boolean>('autoResolve.kernelVersion', true),
stripOutputs: config.get<boolean>('autoResolve.stripOutputs', true),
autoResolveWhitespace: config.get<boolean>('autoResolve.whitespace', true),
hideNonConflictOutputs: config.get<boolean>('ui.hideNonConflictOutputs', true),
enableUndoRedoHotkeys: config.get<boolean>('ui.enableUndoRedoHotkeys', true),
showBaseColumn: config.get<boolean>('ui.showBaseColumn', false),
autoResolveExecutionCount: config.get<boolean>('autoResolve.executionCount', defaults.autoResolveExecutionCount),
autoResolveKernelVersion: config.get<boolean>('autoResolve.kernelVersion', defaults.autoResolveKernelVersion),
stripOutputs: config.get<boolean>('autoResolve.stripOutputs', defaults.stripOutputs),
autoResolveWhitespace: config.get<boolean>('autoResolve.whitespace', defaults.autoResolveWhitespace),
hideNonConflictOutputs: config.get<boolean>('ui.hideNonConflictOutputs', defaults.hideNonConflictOutputs),
enableUndoRedoHotkeys: config.get<boolean>('ui.enableUndoRedoHotkeys', defaults.enableUndoRedoHotkeys),
showBaseColumn: config.get<boolean>('ui.showBaseColumn', defaults.showBaseColumn),
};
}

Expand Down
7 changes: 0 additions & 7 deletions src/tests/repoSetup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,6 @@ export function createMergeConflictRepo(
): string {
const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'mergeNB-integration-'));

const vscodeDir = path.join(tmpDir, '.vscode');
fs.mkdirSync(vscodeDir, { recursive: true });
const settingsPath = path.join(vscodeDir, 'settings.json');
fs.writeFileSync(settingsPath, JSON.stringify({
'mergeNB.ui.showBaseColumn': true
}, null, 4));

git(tmpDir, 'init');
git(tmpDir, 'config', 'user.email', '"test@mergenb.test"');
git(tmpDir, 'config', 'user.name', '"MergeNB Test"');
Expand Down
3 changes: 3 additions & 0 deletions src/tests/runIntegrationTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ async function runTest(test: TestDef): Promise<RunResult> {
const extensionDevelopmentPath = path.resolve(__dirname, '../..');
const testDir = path.resolve(__dirname, '../../test');
let workspacePath: string | undefined;
const testEnv = { ...process.env, MERGENB_TEST_MODE: 'true' };
process.env.MERGENB_TEST_MODE = 'true';

try {
const [baseFile, currentFile, incomingFile] = test.notebooks.map(n =>
Expand All @@ -204,6 +206,7 @@ async function runTest(test: TestDef): Promise<RunResult> {
await runTests({
extensionDevelopmentPath,
extensionTestsPath,
extensionTestsEnv: testEnv,
launchArgs: [
workspacePath,
'--disable-extensions',
Expand Down