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

Merge from vscode e3c4990c67c40213af168300d1cfeb71d680f877 (#16569)

Browse Source
This commit is contained in:
Cory Rivera
2021-08-25 16:28:29 -07:00
committed by GitHub
parent ab1112bfb3
commit cb7b7da0a4
1752 changed files with 59525 additions and 33878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/smoke/src/areas/multiroot/multiroot.test.ts
View File

@@ -22,7 +22,11 @@ async function createWorkspaceFile(workspacePath: string): Promise<string> {
{ path: toUri(path.join(workspacePath, 'public')) },
{ path: toUri(path.join(workspacePath, 'routes')) },
{ path: toUri(path.join(workspacePath, 'views')) }
]
],
settings: {
'workbench.startupEditor': 'none',
'workbench.enableExperiments': false
}
};
fs.writeFileSync(workspaceFilePath, JSON.stringify(workspace, null, '\t'));

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

@@ -63,7 +63,7 @@ export function setup() {
await app.workbench.notebook.waitForActiveCellEditorContents('code()');
});
it('cell action execution', async function () {
it.skip('cell action execution', async function () {
const app = this.app as Application;
await app.workbench.notebook.openNotebook();
await app.workbench.notebook.insertNotebookCell('code');

9
test/smoke/src/areas/search/search.test.ts
View File

@@ -15,6 +15,15 @@ export function setup() {
cp.execSync('git reset --hard HEAD --quiet', { cwd: app.workspacePathOrFolder });
});
// https://github.com/microsoft/vscode/issues/124146
it.skip /* https://github.com/microsoft/vscode/issues/124335 */('has a tooltp with a keybinding', async function () {
const app = this.app as Application;
const tooltip: string = await app.workbench.search.getSearchTooltip();
if (!/Search \(.+\)/.test(tooltip)) {
throw Error(`Expected search tooltip to contain keybinding but got ${tooltip}`);
}
});
it('searches for body & checks for correct result number', async function () {
const app = this.app as Application;
await app.workbench.search.openSearchViewlet();

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

@@ -10,7 +10,8 @@ export function setup() {
before(async function () {
const app = this.app as Application;
if (app.quality === Quality.Dev) {
// Don't run the localization tests in dev or remote.
if (app.quality === Quality.Dev || app.remote) {
return;
}
@@ -23,7 +24,7 @@ export function setup() {
it(`starts with 'DE' locale and verifies title and viewlets text is in German`, async function () {
const app = this.app as Application;
if (app.quality === Quality.Dev) {
if (app.quality === Quality.Dev || app.remote) {
this.skip();
return;
}

4
test/smoke/src/main.ts
View File

@@ -77,6 +77,7 @@ if (screenshotsPath) {
mkdirp.sync(screenshotsPath);
}
// {{SQL CARBON EDIT}} Add logs to smoke tests
const logPath = opts.log ? path.resolve(opts.log) : null;
if (logPath) {
mkdirp.sync(path.dirname(logPath));
@@ -220,6 +221,7 @@ async function setupRepository(): Promise<void> {
cp.spawnSync('git', ['clean', '-xdf'], { cwd: workspacePath });
}
// None of the test run the project
// console.log('*** Running yarn...');
// cp.execSync('yarn', { cwd: workspacePath, stdio: 'inherit' });
}
@@ -268,7 +270,7 @@ before(async function () {
this.timeout(2 * 60 * 1000); // allow two minutes for setup
await setup();
this.defaultOptions = createOptions();
await sqlSetup(this.defaultOptions);
await sqlSetup(this.defaultOptions); // {{SQL CARBON EDIT}}
});
after(async function () {