Fix Extension Smoke tests (microsoft#73072)

sandy081 · web-flow · commit a30ca29b8b4a · 2019-04-30T11:47:26.000+02:00
Fix Extension Smoke tests
diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensionsWidgets.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionsWidgets.ts
@@ -168,7 +168,7 @@ export class TooltipWidget extends ExtensionWidget {
 		this.parent.removeAttribute('aria-label');
 		this.parent.title = this.getTooltip();
 		if (this.extension) {
-			this.parent.setAttribute('aria-label', localize('extension-arialabel', "{0}. {1} Press enter for extension details.", this.extension.displayName));
+			this.parent.setAttribute('aria-label', localize('extension-arialabel', "{0}. Press enter for extension details.", this.extension.displayName));
 		}
 	}
 
diff --git a/test/smoke/src/areas/extensions/extensions.test.ts b/test/smoke/src/areas/extensions/extensions.test.ts
@@ -15,10 +15,9 @@ export function setup() {
 				return;
 			}
 
-			const extensionName = 'vscode-smoketest-check';
 			await app.workbench.extensions.openExtensionsViewlet();
 
-			await app.workbench.extensions.installExtension(extensionName);
+			await app.workbench.extensions.installExtension('michelkaporin.vscode-smoketest-check', 'vscode-smoketest-check');
 
 			await app.workbench.extensions.waitForExtensionsViewlet();
 			await app.workbench.quickopen.runCommand('Smoke Test Check');
diff --git a/test/smoke/src/areas/extensions/extensions.ts b/test/smoke/src/areas/extensions/extensions.ts
@@ -28,14 +28,14 @@ export class Extensions extends Viewlet {
 		await this.code.waitForElement(SEARCH_BOX);
 	}
 
-	async searchForExtension(name: string): Promise<any> {
+	async searchForExtension(id: string): Promise<any> {
 		await this.code.waitAndClick(SEARCH_BOX);
 		await this.code.waitForActiveElement(SEARCH_BOX);
-		await this.code.waitForTypeInEditor(SEARCH_BOX, `name:"${name}"`);
+		await this.code.waitForTypeInEditor(SEARCH_BOX, `@id:${id}`);
 	}
 
-	async installExtension(name: string): Promise<void> {
-		await this.searchForExtension(name);
+	async installExtension(id: string, name: string): Promise<void> {
+		await this.searchForExtension(id);
 		const ariaLabel = `${name}. Press enter for extension details.`;
 		await this.code.waitAndClick(`div.extensions-viewlet[id="workbench.view.extensions"] .monaco-list-row[aria-label="${ariaLabel}"] .extension li[class='action-item'] .extension-action.install`);
 		await this.code.waitForElement(`.extension-editor .monaco-action-bar .action-item:not(.disabled) .extension-action.uninstall`);
diff --git a/test/smoke/src/areas/workbench/localization.test.ts b/test/smoke/src/areas/workbench/localization.test.ts
@@ -14,9 +14,8 @@ export function setup() {
 				return;
 			}
 
-			const extensionName = 'German Language Pack for Visual Studio Code';
 			await app.workbench.extensions.openExtensionsViewlet();
-			await app.workbench.extensions.installExtension(extensionName);
+			await app.workbench.extensions.installExtension('ms-ceintl.vscode-language-pack-de', 'German Language Pack for Visual Studio Code');
 
 			await app.restart({ extraArgs: ['--locale=DE'] });
 		});

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ export class TooltipWidget extends ExtensionWidget {`
`168`	`168`	`this.parent.removeAttribute('aria-label');`
`169`	`169`	`this.parent.title = this.getTooltip();`
`170`	`170`	`if (this.extension) {`
`171`		`- this.parent.setAttribute('aria-label', localize('extension-arialabel', "{0}. {1} Press enter for extension details.", this.extension.displayName));`
	`171`	`+ this.parent.setAttribute('aria-label', localize('extension-arialabel', "{0}. Press enter for extension details.", this.extension.displayName));`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,9 @@ export function setup() {`
`15`	`15`	`return;`
`16`	`16`	`}`
`17`	`17`
`18`		`- const extensionName = 'vscode-smoketest-check';`
`19`	`18`	`await app.workbench.extensions.openExtensionsViewlet();`
`20`	`19`
`21`		`- await app.workbench.extensions.installExtension(extensionName);`
	`20`	`+ await app.workbench.extensions.installExtension('michelkaporin.vscode-smoketest-check', 'vscode-smoketest-check');`
`22`	`21`
`23`	`22`	`await app.workbench.extensions.waitForExtensionsViewlet();`
`24`	`23`	`await app.workbench.quickopen.runCommand('Smoke Test Check');`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,8 @@ export function setup() {`
`14`	`14`	`return;`
`15`	`15`	`}`
`16`	`16`
`17`		`- const extensionName = 'German Language Pack for Visual Studio Code';`
`18`	`17`	`await app.workbench.extensions.openExtensionsViewlet();`
`19`		`- await app.workbench.extensions.installExtension(extensionName);`
	`18`	`+ await app.workbench.extensions.installExtension('ms-ceintl.vscode-language-pack-de', 'German Language Pack for Visual Studio Code');`
`20`	`19`
`21`	`20`	`await app.restart({ extraArgs: ['--locale=DE'] });`
`22`	`21`	`});`