mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-09 09:42:34 -05:00
Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)
* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 * Fixes and cleanup * Distro * Fix hygiene yarn * delete no yarn lock changes file * Fix hygiene * Fix layer check * Fix CI * Skip lib checks * Remove tests deleted in vs code * Fix tests * Distro * Fix tests and add removed extension point * Skip failing notebook tests for now * Disable broken tests and cleanup build folder * Update yarn.lock and fix smoke tests * Bump sqlite * fix contributed actions and file spacing * Fix user data path * Update yarn.locks Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
@@ -18,10 +18,10 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
let configurationValue: IConfigurationValue<any> = {};
|
||||
let updateArgs: any[];
|
||||
let configurationService = new class extends TestConfigurationService {
|
||||
inspect() {
|
||||
override inspect() {
|
||||
return configurationValue;
|
||||
}
|
||||
updateValue() {
|
||||
override updateValue() {
|
||||
updateArgs = [...arguments];
|
||||
return Promise.resolve();
|
||||
}
|
||||
@@ -40,13 +40,13 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
test('updateValue writes without target and overrides when no language is defined', async () => {
|
||||
const resource = URI.file('someFile');
|
||||
await testObject.updateValue(resource, 'a', 'b');
|
||||
assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_LOCAL]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_LOCAL]);
|
||||
});
|
||||
|
||||
test('updateValue writes with target and without overrides when no language is defined', async () => {
|
||||
const resource = URI.file('someFile');
|
||||
await testObject.updateValue(resource, 'a', 'b', ConfigurationTarget.USER_LOCAL);
|
||||
assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_LOCAL]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_LOCAL]);
|
||||
});
|
||||
|
||||
test('updateValue writes into given memory target without overrides', async () => {
|
||||
@@ -59,7 +59,7 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
const resource = URI.file('someFile');
|
||||
|
||||
await testObject.updateValue(resource, 'a', 'b', ConfigurationTarget.MEMORY);
|
||||
assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.MEMORY]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.MEMORY]);
|
||||
});
|
||||
|
||||
test('updateValue writes into given workspace target without overrides', async () => {
|
||||
@@ -72,7 +72,7 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
const resource = URI.file('someFile');
|
||||
|
||||
await testObject.updateValue(resource, 'a', 'b', ConfigurationTarget.WORKSPACE);
|
||||
assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.WORKSPACE]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.WORKSPACE]);
|
||||
});
|
||||
|
||||
test('updateValue writes into given user target without overrides', async () => {
|
||||
@@ -85,7 +85,7 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
const resource = URI.file('someFile');
|
||||
|
||||
await testObject.updateValue(resource, 'a', 'b', ConfigurationTarget.USER);
|
||||
assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER]);
|
||||
});
|
||||
|
||||
test('updateValue writes into given workspace folder target with overrides', async () => {
|
||||
@@ -98,7 +98,7 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
const resource = URI.file('someFile');
|
||||
|
||||
await testObject.updateValue(resource, 'a', 'b', ConfigurationTarget.WORKSPACE_FOLDER);
|
||||
assert.deepEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.WORKSPACE_FOLDER]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.WORKSPACE_FOLDER]);
|
||||
});
|
||||
|
||||
test('updateValue writes into derived workspace folder target without overrides', async () => {
|
||||
@@ -111,7 +111,7 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
const resource = URI.file('someFile');
|
||||
|
||||
await testObject.updateValue(resource, 'a', 'b');
|
||||
assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.WORKSPACE_FOLDER]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.WORKSPACE_FOLDER]);
|
||||
});
|
||||
|
||||
test('updateValue writes into derived workspace folder target with overrides', async () => {
|
||||
@@ -125,7 +125,7 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
const resource = URI.file('someFile');
|
||||
|
||||
await testObject.updateValue(resource, 'a', 'b');
|
||||
assert.deepEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.WORKSPACE_FOLDER]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.WORKSPACE_FOLDER]);
|
||||
});
|
||||
|
||||
test('updateValue writes into derived workspace target without overrides', async () => {
|
||||
@@ -138,7 +138,7 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
const resource = URI.file('someFile');
|
||||
|
||||
await testObject.updateValue(resource, 'a', 'b');
|
||||
assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.WORKSPACE]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.WORKSPACE]);
|
||||
});
|
||||
|
||||
test('updateValue writes into derived workspace target with overrides', async () => {
|
||||
@@ -151,7 +151,7 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
const resource = URI.file('someFile');
|
||||
|
||||
await testObject.updateValue(resource, 'a', 'b');
|
||||
assert.deepEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.WORKSPACE]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.WORKSPACE]);
|
||||
});
|
||||
|
||||
test('updateValue writes into derived workspace target with overrides and value defined in folder', async () => {
|
||||
@@ -165,7 +165,7 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
const resource = URI.file('someFile');
|
||||
|
||||
await testObject.updateValue(resource, 'a', 'b');
|
||||
assert.deepEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.WORKSPACE]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.WORKSPACE]);
|
||||
});
|
||||
|
||||
test('updateValue writes into derived user remote target without overrides', async () => {
|
||||
@@ -178,7 +178,7 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
const resource = URI.file('someFile');
|
||||
|
||||
await testObject.updateValue(resource, 'a', 'b');
|
||||
assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_REMOTE]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_REMOTE]);
|
||||
});
|
||||
|
||||
test('updateValue writes into derived user remote target with overrides', async () => {
|
||||
@@ -191,7 +191,7 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
const resource = URI.file('someFile');
|
||||
|
||||
await testObject.updateValue(resource, 'a', 'b');
|
||||
assert.deepEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_REMOTE]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_REMOTE]);
|
||||
});
|
||||
|
||||
test('updateValue writes into derived user remote target with overrides and value defined in workspace', async () => {
|
||||
@@ -205,7 +205,7 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
const resource = URI.file('someFile');
|
||||
|
||||
await testObject.updateValue(resource, 'a', 'b');
|
||||
assert.deepEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_REMOTE]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_REMOTE]);
|
||||
});
|
||||
|
||||
test('updateValue writes into derived user remote target with overrides and value defined in workspace folder', async () => {
|
||||
@@ -220,7 +220,7 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
const resource = URI.file('someFile');
|
||||
|
||||
await testObject.updateValue(resource, 'a', 'b');
|
||||
assert.deepEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_REMOTE]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_REMOTE]);
|
||||
});
|
||||
|
||||
test('updateValue writes into derived user target without overrides', async () => {
|
||||
@@ -232,7 +232,7 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
const resource = URI.file('someFile');
|
||||
|
||||
await testObject.updateValue(resource, 'a', 'b');
|
||||
assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_LOCAL]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_LOCAL]);
|
||||
});
|
||||
|
||||
test('updateValue writes into derived user target with overrides', async () => {
|
||||
@@ -244,7 +244,7 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
const resource = URI.file('someFile');
|
||||
|
||||
await testObject.updateValue(resource, 'a', '2');
|
||||
assert.deepEqual(updateArgs, ['a', '2', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_LOCAL]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', '2', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_LOCAL]);
|
||||
});
|
||||
|
||||
test('updateValue writes into derived user target with overrides and value is defined in remote', async () => {
|
||||
@@ -257,7 +257,7 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
const resource = URI.file('someFile');
|
||||
|
||||
await testObject.updateValue(resource, 'a', '2');
|
||||
assert.deepEqual(updateArgs, ['a', '2', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_LOCAL]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', '2', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_LOCAL]);
|
||||
});
|
||||
|
||||
test('updateValue writes into derived user target with overrides and value is defined in workspace', async () => {
|
||||
@@ -270,7 +270,7 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
const resource = URI.file('someFile');
|
||||
|
||||
await testObject.updateValue(resource, 'a', '2');
|
||||
assert.deepEqual(updateArgs, ['a', '2', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_LOCAL]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', '2', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_LOCAL]);
|
||||
});
|
||||
|
||||
test('updateValue writes into derived user target with overrides and value is defined in workspace folder', async () => {
|
||||
@@ -284,7 +284,7 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
const resource = URI.file('someFile');
|
||||
|
||||
await testObject.updateValue(resource, 'a', '2');
|
||||
assert.deepEqual(updateArgs, ['a', '2', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_LOCAL]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', '2', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_LOCAL]);
|
||||
});
|
||||
|
||||
test('updateValue when not changed', async () => {
|
||||
@@ -295,7 +295,7 @@ suite('TextResourceConfigurationService - Update', () => {
|
||||
const resource = URI.file('someFile');
|
||||
|
||||
await testObject.updateValue(resource, 'a', 'b');
|
||||
assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_LOCAL]);
|
||||
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_LOCAL]);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user