@theia/api-tests 1.77.0-next.99 → 1.77.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,9 +1,9 @@
1
1
  {
2
2
  "name": "@theia/api-tests",
3
- "version": "1.77.0-next.99+2a7305415",
3
+ "version": "1.77.0",
4
4
  "description": "Theia API tests",
5
5
  "dependencies": {
6
- "@theia/core": "1.77.0-next.99+2a7305415"
6
+ "@theia/core": "1.77.0"
7
7
  },
8
8
  "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0",
9
9
  "repository": {
@@ -20,5 +20,5 @@
20
20
  "publishConfig": {
21
21
  "access": "public"
22
22
  },
23
- "gitHead": "2a73054157f8bf0d3969a98d6292f15f6c45404a"
23
+ "gitHead": "9c6d81590b559ee8a78a7808203674f3127411f1"
24
24
  }
@@ -590,15 +590,8 @@ describe('Launch Preferences', function () {
590
590
  assert.deepStrictEqual(JSON.parse(JSON.stringify(config)), expectation);
591
591
  });
592
592
 
593
- testIt('get from undefined', () => {
594
- /** @type {any} */
595
- const config = preferences.get('launch', undefined, undefined);
596
- assert.deepStrictEqual(JSON.parse(JSON.stringify(config)), expectation);
597
- });
598
-
599
593
  testIt('get from rootUri', () => {
600
- /** @type {any} */
601
- const config = preferences.get('launch', undefined, rootUri.toString());
594
+ const config = preferences.get('launch', { resource: rootUri.toString() });
602
595
  assert.deepStrictEqual(JSON.parse(JSON.stringify(config)), expectation);
603
596
  });
604
597
 
@@ -45,8 +45,6 @@ describe('Preferences', function () {
45
45
  const tabSize = 'editor.tabSize';
46
46
  const fontSize = 'editor.fontSize';
47
47
  const override = overrideService.markLanguageOverride(overrideIdentifier);
48
- const overriddenTabSize = overrideService.overridePreferenceName({ overrideIdentifier, preferenceName: tabSize });
49
- const overriddenFontSize = overrideService.overridePreferenceName({ overrideIdentifier, preferenceName: fontSize });
50
48
  /**
51
49
  * @returns {Promise<Record<string, any>>}
52
50
  */
@@ -62,9 +60,10 @@ describe('Preferences', function () {
62
60
  /**
63
61
  * @param {string} key
64
62
  * @param {unknown} value
63
+ * @param {string} overrideIdentifier
65
64
  */
66
- async function setPreference(key, value) {
67
- return preferenceService.set(key, value, PreferenceScope.Workspace);
65
+ async function setPreference(key, value, overrideIdentifier) {
66
+ return preferenceService.set(key, value, PreferenceScope.Workspace, undefined, overrideIdentifier);
68
67
  }
69
68
 
70
69
  async function deleteAllValues() {
@@ -110,8 +109,12 @@ describe('Preferences', function () {
110
109
 
111
110
  beforeEach(async function () {
112
111
  const prefs = await getPreferences();
113
- for (const key of [tabSize, fontSize, override, overriddenTabSize, overriddenFontSize]) {
114
- shouldBeUndefined(prefs[key], key);
112
+ for (const key of [tabSize, fontSize, override, [override, tabSize], [override, fontSize]]) {
113
+ if (Array.isArray(key)) {
114
+ shouldBeUndefined(prefs, ...key);
115
+ } else {
116
+ shouldBeUndefined(prefs, key);
117
+ }
115
118
  }
116
119
  });
117
120
 
@@ -120,11 +123,18 @@ describe('Preferences', function () {
120
123
  });
121
124
 
122
125
  /**
123
- * @param {unknown} value
124
- * @param {string} key
126
+ * @param {unknown} prefs
127
+ * @param {string[]} keys
125
128
  */
126
- function shouldBeUndefined(value, key) {
127
- assert.isUndefined(value, `There should be no ${key} object or value in the preferences.`);
129
+ function shouldBeUndefined(prefs, ...keys) {
130
+ let value = prefs;
131
+ for (const key of keys) {
132
+ if (value) {
133
+ value = value[key];
134
+ }
135
+
136
+ }
137
+ assert.isUndefined(value, `There should be no ${JSON.stringify(keys)} object or value in the preferences.`);
128
138
  }
129
139
 
130
140
  /**
@@ -133,16 +143,16 @@ describe('Preferences', function () {
133
143
  async function setUpOverride() {
134
144
  const startingTabSize = preferenceService.get(tabSize);
135
145
  const startingFontSize = preferenceService.get(fontSize);
136
- assert.equal(preferenceService.get(overriddenTabSize), startingTabSize, 'The overridden value should equal the default.');
137
- assert.equal(preferenceService.get(overriddenFontSize), startingFontSize, 'The overridden value should equal the default.');
146
+ assert.equal(preferenceService.get(tabSize, { override: overrideIdentifier }), startingTabSize, 'The overridden value should equal the default.');
147
+ assert.equal(preferenceService.get(fontSize, { override: overrideIdentifier }), startingFontSize, 'The overridden value should equal the default.');
138
148
  const newTabSize = startingTabSize + 2;
139
149
  const newFontSize = startingFontSize + 2;
140
150
  await Promise.all([
141
- setPreference(overriddenTabSize, newTabSize),
142
- setPreference(overriddenFontSize, newFontSize),
151
+ setPreference(tabSize, newTabSize, overrideIdentifier),
152
+ setPreference(fontSize, newFontSize, overrideIdentifier),
143
153
  ]);
144
- assert.equal(preferenceService.get(overriddenTabSize), newTabSize, 'After setting, the new value should be active for the override.');
145
- assert.equal(preferenceService.get(overriddenFontSize), newFontSize, 'After setting, the new value should be active for the override.');
154
+ assert.equal(preferenceService.get(tabSize, { override: overrideIdentifier }), newTabSize, 'After setting, the new value should be active for the override.');
155
+ assert.equal(preferenceService.get(fontSize, { override: overrideIdentifier }), newFontSize, 'After setting, the new value should be active for the override.');
146
156
  return { newTabSize, newFontSize, startingTabSize, startingFontSize };
147
157
  }
148
158
 
@@ -152,27 +162,14 @@ describe('Preferences', function () {
152
162
  assert.isObject(prefs[override], 'The override should be a key in the preference object.');
153
163
  assert.equal(prefs[override][tabSize], newTabSize, 'editor.tabSize should be a key in the override object and have the correct value.');
154
164
  assert.equal(prefs[override][fontSize], newFontSize, 'editor.fontSize should be a key in the override object and should have the correct value.');
155
- shouldBeUndefined(prefs[overriddenTabSize], overriddenTabSize);
156
- shouldBeUndefined(prefs[overriddenFontSize], overriddenFontSize);
157
165
  });
158
166
 
159
167
  it('Allows deletion of individual keys in the override object.', async function () {
160
168
  const { startingTabSize } = await setUpOverride();
161
- await setPreference(overriddenTabSize, undefined);
162
- assert.equal(preferenceService.get(overriddenTabSize), startingTabSize);
163
- const prefs = await getPreferences();
164
- shouldBeUndefined(prefs[override][tabSize], tabSize);
165
- shouldBeUndefined(prefs[overriddenFontSize], overriddenFontSize);
166
- shouldBeUndefined(prefs[overriddenTabSize], overriddenTabSize);
167
- });
168
-
169
- it('Allows deletion of the whole override object', async function () {
170
- const { startingFontSize, startingTabSize } = await setUpOverride();
171
- await setPreference(override, undefined);
172
- assert.equal(preferenceService.get(overriddenTabSize), startingTabSize, 'The overridden value should revert to the default.');
173
- assert.equal(preferenceService.get(overriddenFontSize), startingFontSize, 'The overridden value should revert to the default.');
169
+ await setPreference(tabSize, undefined, overrideIdentifier);
170
+ assert.equal(preferenceService.get(tabSize, { override: overrideIdentifier }), startingTabSize);
174
171
  const prefs = await getPreferences();
175
- shouldBeUndefined(prefs[override], override);
172
+ shouldBeUndefined(prefs, override, tabSize);
176
173
  });
177
174
 
178
175
  it('Handles many synchronous settings of preferences gracefully', async function () {
@@ -200,7 +197,7 @@ describe('Preferences', function () {
200
197
  const results = await Promise.allSettled(promises);
201
198
  const expectedValues = { [searchPref]: searchDebounce, [channelPref]: channelHistory, [hoverPref]: hoverDelay };
202
199
  const actualValues = { [searchPref]: preferenceService.get(searchPref), [channelPref]: preferenceService.get(channelPref), [hoverPref]: preferenceService.get(hoverPref), }
203
- const eventKeys = event && Object.keys(event).sort();
200
+ const eventKeys = event && event.map(evt => evt.preferenceName).sort();
204
201
  toDispose.dispose();
205
202
  assert(results.every(setting => setting.status === 'fulfilled'), 'All promises should have resolved rather than rejected.');
206
203
  assert.deepEqual([channelPref, searchPref, hoverPref], eventKeys, 'The event should contain the changed preference names.');
@@ -67,7 +67,7 @@ describe('Saveable', function () {
67
67
  const toTearDown = new DisposableCollection();
68
68
 
69
69
  /** @type {string | undefined} */
70
- const autoSave = preferences.get('files.autoSave', undefined, rootUri.toString());
70
+ const autoSave = preferences.get('files.autoSave', { resource: rootUri.toString() });
71
71
 
72
72
  beforeEach(async () => {
73
73
  await preferences.set('files.autoSave', 'off', undefined, rootUri.toString());
@@ -73,7 +73,7 @@ describe('Undo, Redo and Select All', function () {
73
73
  } while (true);
74
74
  }
75
75
 
76
- const originalValue = preferenceService.get('files.autoSave', undefined, rootUri.toString());
76
+ const originalValue = preferenceService.get('files.autoSave', { resource: rootUri.toString() });
77
77
  before(async () => {
78
78
  await preferenceService.set('files.autoSave', 'off', undefined, rootUri.toString());
79
79
  await preferenceService.set('git.autoRepositoryDetection', true);