From 925f3ab1a071b60ca5c674c547cf2b56b5c1f42b Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Thu, 3 Oct 2019 08:50:55 +0200 Subject: [PATCH] fixes #81871 --- test/automation/src/scm.ts | 2 +- test/smoke/src/areas/git/git.test.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/automation/src/scm.ts b/test/automation/src/scm.ts index 2f56e31a87c..60a33abb93f 100644 --- a/test/automation/src/scm.ts +++ b/test/automation/src/scm.ts @@ -67,7 +67,7 @@ export class SCM extends Viewlet { async unstage(name: string): Promise { 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 { diff --git a/test/smoke/src/areas/git/git.test.ts b/test/smoke/src/areas/git/git.test.ts index a23a4f3080b..91948d04b1f 100644 --- a/test/smoke/src/areas/git/git.test.ts +++ b/test/smoke/src/areas/git/git.test.ts @@ -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'); -- GitLab