Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 02:28:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Git - remove the usage of cp.execSync from git integration test. Add assertions. (#229395)

Browse Source
This commit is contained in:
Ladislau Szomoru
2024-09-23 18:00:23 +02:00
committed by GitHub
parent a322a93709
commit deea09a36f
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
extensions/git/src/test/smoke.test.ts
View File

@@ -129,28 +129,26 @@ suite('git smoke test', function () {
});
test('rename/delete conflict', async function () {
cp.execSync('git checkout -b test', { cwd });
await commands.executeCommand('workbench.view.scm');
await repository.createBranch('test', true);
// Delete file (test branch)
fs.unlinkSync(file('app.js'));
cp.execSync('git add .', { cwd });
await repository.commit('commit on test', { all: true });
await repository.commit('commit on test');
cp.execSync('git checkout main', { cwd });
await repository.checkout('main');
// Rename file (main branch)
fs.renameSync(file('app.js'), file('rename.js'));
cp.execSync('git add .', { cwd });
await repository.commit('commit on main');
await repository.commit('commit on main', { all: true });
try {
cp.execSync('git merge test', { cwd });
await repository.merge('test');
} catch (e) { }
setTimeout(() => {
commands.executeCommand('workbench.scm.focus');
}, 2e3);
await new Promise(resolve => {
setTimeout(resolve, 5e3);
});
assert.strictEqual(repository.state.mergeChanges.length, 1);
assert.strictEqual(repository.state.workingTreeChanges.length, 0);
assert.strictEqual(repository.state.indexChanges.length, 0);
});
});