Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove selectorExecute

Browse Source
This commit is contained in:
Joao Moreno
2018-04-10 17:05:14 +02:00
parent fc0774e44f
commit 8eae25a2ba
8 changed files with 132 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/vs/platform/driver/common/driver.ts
View File

@@ -34,7 +34,7 @@ export interface IDriver {
isActiveElement(windowId: number, selector: string): TPromise<boolean>;
getElements(windowId: number, selector: string, recursive: boolean): TPromise<IElement[]>;
typeInEditor(windowId: number, selector: string, text: string): TPromise<void>;
selectorExecute<P>(windowId: number, selector: string, script: (elements: HTMLElement[], ...args: any[]) => P, ...args: any[]): TPromise<P>;
getTerminalBuffer(windowId: number, selector: string): TPromise<string[]>;
}
//*END
@@ -49,7 +49,7 @@ export interface IDriverChannel extends IChannel {
call(command: 'isActiveElement', arg: [number, string]): TPromise<boolean>;
call(command: 'getElements', arg: [number, string, boolean]): TPromise<IElement[]>;
call(command: 'typeInEditor', arg: [number, string, string]): TPromise<void>;
call(command: 'selectorExecute', arg: [number, string, string, any[]]): TPromise<any>;
call(command: 'getTerminalBuffer', arg: [number, string]): TPromise<string[]>;
call(command: string, arg: any): TPromise<any>;
}
@@ -69,9 +69,7 @@ export class DriverChannel implements IDriverChannel {
case 'isActiveElement': return this.driver.isActiveElement(arg[0], arg[1]);
case 'getElements': return this.driver.getElements(arg[0], arg[1], arg[2]);
case 'typeInEditor': return this.driver.typeInEditor(arg[0], arg[1], arg[2]);
// TODO@joao
case 'selectorExecute': return this.driver.selectorExecute(arg[0], arg[1], arg[1], ...arg[2]);
case 'getTerminalBuffer': return this.driver.getTerminalBuffer(arg[0], arg[1]);
}
return undefined;
@@ -124,9 +122,8 @@ export class DriverChannelClient implements IDriver {
return this.channel.call('typeInEditor', [windowId, selector, text]);
}
selectorExecute<P>(windowId: number, selector: string, script: (elements: HTMLElement[], ...args: any[]) => P, ...args: any[]): TPromise<P> {
// TODO@joao
return this.channel.call('selectorExecute', [windowId, selector, script.toString(), args]);
getTerminalBuffer(windowId: number, selector: string): TPromise<string[]> {
return this.channel.call('getTerminalBuffer', [windowId, selector]);
}
}
@@ -172,7 +169,7 @@ export interface IWindowDriver {
isActiveElement(selector: string): TPromise<boolean>;
getElements(selector: string, recursive: boolean): TPromise<IElement[]>;
typeInEditor(selector: string, text: string): TPromise<void>;
selectorExecute<P>(selector: string, script: (elements: HTMLElement[], ...args: any[]) => P, ...args: any[]): TPromise<P>;
getTerminalBuffer(selector: string): TPromise<string[]>;
}
export interface IWindowDriverChannel extends IChannel {
@@ -184,7 +181,7 @@ export interface IWindowDriverChannel extends IChannel {
call(command: 'isActiveElement', arg: string): TPromise<boolean>;
call(command: 'getElements', arg: [string, boolean]): TPromise<IElement[]>;
call(command: 'typeInEditor', arg: [string, string]): TPromise<void>;
call(command: 'selectorExecute', arg: [string, string, any[]]): TPromise<any>;
call(command: 'getTerminalBuffer', arg: string): TPromise<string[]>;
call(command: string, arg: any): TPromise<any>;
}
@@ -202,8 +199,7 @@ export class WindowDriverChannel implements IWindowDriverChannel {
case 'isActiveElement': return this.driver.isActiveElement(arg);
case 'getElements': return this.driver.getElements(arg[0], arg[1]);
case 'typeInEditor': return this.driver.typeInEditor(arg[0], arg[1]);
// TODO@joao
case 'selectorExecute': return this.driver.selectorExecute(arg[0], arg[1], ...arg[2]);
case 'getTerminalBuffer': return this.driver.getTerminalBuffer(arg);
}
return undefined;
@@ -248,8 +244,7 @@ export class WindowDriverChannelClient implements IWindowDriver {
return this.channel.call('typeInEditor', [selector, text]);
}
selectorExecute<P>(selector: string, script: (elements: HTMLElement[], ...args: any[]) => P, ...args: any[]): TPromise<P> {
// TODO@joao
return this.channel.call('selectorExecute', [selector, script.toString(), args]);
getTerminalBuffer(selector: string): TPromise<string[]> {
return this.channel.call('getTerminalBuffer', selector);
}
}

21
src/vs/platform/driver/electron-browser/driver.ts
View File

@@ -95,9 +95,6 @@ class WindowDriver implements IWindowDriver {
}
const textarea = element as HTMLTextAreaElement;
console.log(textarea);
const start = textarea.selectionStart;
const newStart = start + text.length;
const value = textarea.value;
@@ -110,8 +107,22 @@ class WindowDriver implements IWindowDriver {
textarea.dispatchEvent(event);
}
selectorExecute<P>(selector: string, script: (elements: HTMLElement[], ...args: any[]) => P, ...args: any[]): TPromise<P> {
return TPromise.wrapError(new Error('not implemented'));
async getTerminalBuffer(selector: string): TPromise<string[]> {
const element = document.querySelector(selector);
if (!element) {
throw new Error('Terminal not found: ' + selector);
}
const buffer = (element as any).xterm.buffer;
const lines: string[] = [];
for (let i = 0; i < buffer.lines.length; i++) {
lines.push(buffer.translateBufferLineToString(i, true));
}
return lines;
}
}

10
src/vs/platform/driver/electron-main/driver.ts
View File

@@ -132,16 +132,16 @@ export class Driver implements IDriver, IWindowDriverRegistry {
return windowDriver.getElements(selector, recursive);
}
selectorExecute<P>(windowId: number, selector: string, script: (elements: HTMLElement[], ...args: any[]) => P, ...args: any[]): TPromise<P> {
const windowDriver = this.getWindowDriver(windowId);
return windowDriver.selectorExecute(selector, script, ...args);
}
typeInEditor(windowId: number, selector: string, text: string): TPromise<void> {
const windowDriver = this.getWindowDriver(windowId);
return windowDriver.typeInEditor(selector, text);
}
getTerminalBuffer(windowId: number, selector: string): TPromise<string[]> {
const windowDriver = this.getWindowDriver(windowId);
return windowDriver.getTerminalBuffer(selector);
}
private getWindowDriver(windowId: number): IWindowDriver {
const router = new WindowRouter(windowId);
const windowDriverChannel = this.windowServer.getChannel<IWindowDriverChannel>('windowDriver', router);