development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-05 19:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes #81871

Browse source
This commit is contained in:
Joao Moreno 2019-10-03 08:50:55 +02:00
parent bb9beb73b0
commit 925f3ab1a0
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/automation/src/scm.ts
View file

@ -67,7 +67,7 @@ export class SCM extends Viewlet {
async unstage(name: string): Promise<void> {
await this.code.waitAndClick(SCM_RESOURCE_ACTION_CLICK(name, 'Unstage Changes'));
await this.waitForChange('app.js', 'Modified');
await this.waitForChange(name, 'Modified');
}
async commit(message: string): Promise<void> {

3
test/smoke/src/areas/git/git.test.ts
View file

@ -13,7 +13,6 @@ export function setup() {
describe('Git', () => {
before(async function () {
const app = this.app as Application;
await app.workbench.settingsEditor.addUserSetting('scm.defaultViewMode', '"list"');
cp.execSync('git config user.name testuser', { cwd: app.workspacePathOrFolder });
cp.execSync('git config user.email monacotools@microsoft.com', { cwd: app.workspacePathOrFolder });
@ -52,6 +51,7 @@ export function setup() {
await app.workbench.scm.waitForChange('app.js', 'Modified');
await app.workbench.scm.stage('app.js');
await app.workbench.scm.openChange('app.js');
await app.workbench.scm.unstage('app.js');
});
@ -61,6 +61,7 @@ export function setup() {
await app.workbench.scm.openSCMViewlet();
await app.workbench.scm.waitForChange('app.js', 'Modified');
await app.workbench.scm.openChange('app.js');
await app.workbench.scm.stage('app.js');
await app.workbench.scm.commit('first commit');