ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-13 17:22:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 6e530127a1bb8ffbd1bfb77dc680c321dc0d71f5 (#6844)

Browse Source
This commit is contained in:
Anthony Dresser
2019-08-20 21:07:47 -07:00
committed by GitHub
parent 1f00249646
commit ecb80f14f0
221 changed files with 3140 additions and 1552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/smoke/src/application.ts
View File

@@ -149,7 +149,7 @@ export class Application {
await this.code.waitForElement('.monaco-workbench');
if (this.remote) {
await this.code.waitForElement('.monaco-workbench .statusbar-item[title="Editing on TestResolver"]');
await this.code.waitForElement('.monaco-workbench .statusbar-item[id="status.host"]');
}
// wait a bit, since focus might be stolen off widgets

5
test/smoke/src/vscode/puppeteerDriver.ts
View File

@@ -26,7 +26,7 @@ const vscodeToPuppeteerKey = {
};
function buildDriver(browser: puppeteer.Browser, page: puppeteer.Page): IDriver {
const driver = {
const driver: IDriver = {
_serviceBrand: undefined,
getWindowIds: () => {
return Promise.resolve([1]);
@@ -98,6 +98,7 @@ export async function launch(_args: string[]): Promise<void> {
server.stdout.on('data', e => console.log('Server stdout: ' + e));
process.on('exit', teardown);
process.on('SIGINT', teardown);
process.on('SIGTERM', teardown);
endpoint = await waitForEndpoint();
}
@@ -180,7 +181,7 @@ export interface IDriver {
getTitle(windowId: number): Promise<string>;
isActiveElement(windowId: number, selector: string): Promise<boolean>;
getElements(windowId: number, selector: string, recursive?: boolean): Promise<IElement[]>;
getElementXY(selector: string, xoffset?: number, yoffset?: number): Promise<{ x: number; y: number; }>;
getElementXY(windowId: number, selector: string, xoffset?: number, yoffset?: number): Promise<{ x: number; y: number; }>;
typeInEditor(windowId: number, selector: string, text: string): Promise<void>;
getTerminalBuffer(windowId: number, selector: string): Promise<string[]>;
writeInTerminal(windowId: number, selector: string, text: string): Promise<void>;