ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode cfbd1999769f4f08dce29629fb92fdc0fac53829

Browse Source
This commit is contained in:
ADS Merger
2020-08-06 07:08:52 +00:00
parent 9c67832880
commit 540046ba00
362 changed files with 7588 additions and 6584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/automation/src/extensions.ts
View File

@@ -34,9 +34,9 @@ export class Extensions extends Viewlet {
await this.code.waitForTypeInEditor(SEARCH_BOX, `@id:${id}`);
}
async installExtension(id: string, name: string): Promise<void> {
async installExtension(id: string, name: string, version: string, publisherDisplayName: string): Promise<void> {
await this.searchForExtension(id);
const ariaLabel = `${name}. Press enter for extension details.`;
const ariaLabel = `${name}, ${version}, ${publisherDisplayName}, press enter for extension details.`;
await this.code.waitAndClick(`div.extensions-viewlet[id="workbench.view.extensions"] .monaco-list-row[aria-label="${ariaLabel}"] .extension-list-item li[class='action-item'] .extension-action.install`);
await this.code.waitForElement(`.extension-editor .monaco-action-bar .action-item:not(.disabled) .extension-action.uninstall`);
}

2
test/smoke/src/areas/extensions/extensions.test.ts
View File

@@ -17,7 +17,7 @@ export function setup() {
await app.workbench.extensions.openExtensionsViewlet();
await app.workbench.extensions.installExtension('michelkaporin.vscode-smoketest-check', 'vscode-smoketest-check');
await app.workbench.extensions.installExtension('michelkaporin.vscode-smoketest-check', 'vscode-smoketest-check', '0.0.1', 'Michel Kaporin');
await app.workbench.extensions.waitForExtensionsViewlet();

2
test/smoke/src/areas/notebook/notebook.test.ts
View File

@@ -54,7 +54,7 @@ export function setup() {
await app.workbench.notebook.waitForMarkdownContents('p', 'Markdown Cell');
});
it('moves focus in and out of output', async function () {
it.skip('moves focus in and out of output', async function () {
const app = this.app as Application;
await app.workbench.notebook.openNotebook();
await app.workbench.notebook.executeActiveCell();

4
test/smoke/src/areas/workbench/localization.test.ts
View File

@@ -6,7 +6,7 @@
import { Application, Quality } from '../../../../automation';
export function setup() {
describe('Localization', () => {
describe.skip('Localization', () => {
before(async function () {
const app = this.app as Application;
@@ -15,7 +15,7 @@ export function setup() {
}
await app.workbench.extensions.openExtensionsViewlet();
await app.workbench.extensions.installExtension('ms-ceintl.vscode-language-pack-de', 'German Language Pack for Visual Studio Code');
await app.workbench.extensions.installExtension('ms-ceintl.vscode-language-pack-de', 'German Language Pack for Visual Studio Code', '1.47.3', 'Microsoft');
await app.restart({ extraArgs: ['--locale=DE'] });
});

8
test/unit/electron/index.js
View File

@@ -12,10 +12,6 @@ const events = require('events');
// const MochaJUnitReporter = require('mocha-junit-reporter');
const url = require('url');
// Disable render process reuse, we still have
// non-context aware native modules in the renderer.
app.allowRendererProcessReuse = false;
const defaultReporterName = process.platform === 'win32' ? 'list' : 'spec';
const optimist = require('optimist')
@@ -72,7 +68,8 @@ function deserializeRunnable(runnable) {
async: runnable.async,
slow: () => runnable.slow,
speed: runnable.speed,
duration: runnable.duration
duration: runnable.duration,
currentRetry: () => runnable.currentRetry
};
}
@@ -129,7 +126,6 @@ app.on('ready', () => {
nodeIntegration: true,
enableWebSQL: false,
enableRemoteModule: false,
spellcheck: false,
nativeWindowOpen: true,
webviewTag: true
}