From 615e262789c3f1872758c119a095254fa5316ad7 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Wed, 2 Oct 2019 14:46:18 -0700 Subject: [PATCH] Fix git smoke tests --- test/automation/src/scm.ts | 2 +- test/smoke/src/areas/git/git.test.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/automation/src/scm.ts b/test/automation/src/scm.ts index 519faddb27c..2f56e31a87c 100644 --- a/test/automation/src/scm.ts +++ b/test/automation/src/scm.ts @@ -9,7 +9,7 @@ import { findElement, findElements, Code } from './code'; const VIEWLET = 'div[id="workbench.view.scm"]'; const SCM_INPUT = `${VIEWLET} .scm-editor textarea`; -const SCM_RESOURCE = `${VIEWLET} .monaco-list-row > .resource`; +const SCM_RESOURCE = `${VIEWLET} .monaco-list-row .resource`; const REFRESH_COMMAND = `div[id="workbench.parts.sidebar"] .actions-container a.action-label[title="Refresh"]`; const COMMIT_COMMAND = `div[id="workbench.parts.sidebar"] .actions-container a.action-label[title="Commit"]`; const SCM_RESOURCE_CLICK = (name: string) => `${SCM_RESOURCE} .monaco-icon-label[title*="${name}"] .label-name`; diff --git a/test/smoke/src/areas/git/git.test.ts b/test/smoke/src/areas/git/git.test.ts index 300c832694d..a23a4f3080b 100644 --- a/test/smoke/src/areas/git/git.test.ts +++ b/test/smoke/src/areas/git/git.test.ts @@ -13,6 +13,7 @@ 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 });