mirror of
https://github.com/Microsoft/vscode
synced 2024-10-06 03:17:00 +00:00
fixes #81871
This commit is contained in:
parent
bb9beb73b0
commit
925f3ab1a0
|
@ -67,7 +67,7 @@ export class SCM extends Viewlet {
|
||||||
|
|
||||||
async unstage(name: string): Promise<void> {
|
async unstage(name: string): Promise<void> {
|
||||||
await this.code.waitAndClick(SCM_RESOURCE_ACTION_CLICK(name, 'Unstage Changes'));
|
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> {
|
async commit(message: string): Promise<void> {
|
||||||
|
|
|
@ -13,7 +13,6 @@ export function setup() {
|
||||||
describe('Git', () => {
|
describe('Git', () => {
|
||||||
before(async function () {
|
before(async function () {
|
||||||
const app = this.app as Application;
|
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.name testuser', { cwd: app.workspacePathOrFolder });
|
||||||
cp.execSync('git config user.email monacotools@microsoft.com', { 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.waitForChange('app.js', 'Modified');
|
||||||
|
|
||||||
await app.workbench.scm.stage('app.js');
|
await app.workbench.scm.stage('app.js');
|
||||||
|
await app.workbench.scm.openChange('app.js');
|
||||||
await app.workbench.scm.unstage('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.openSCMViewlet();
|
||||||
await app.workbench.scm.waitForChange('app.js', 'Modified');
|
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.stage('app.js');
|
||||||
|
|
||||||
await app.workbench.scm.commit('first commit');
|
await app.workbench.scm.commit('first commit');
|
||||||
|
|
Loading…
Reference in a new issue