@theia/api-tests 1.26.0-next.23 → 1.26.0-next.26

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@theia/api-tests",
-  "version": "1.26.0-next.23+1a7e6e0f4d0",
+  "version": "1.26.0-next.26+c4e55ec01ed",
   "description": "Theia API tests",
   "dependencies": {
-    "@theia/core": "1.26.0-next.23+1a7e6e0f4d0"
+    "@theia/core": "1.26.0-next.26+c4e55ec01ed"
   },
   "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
   "repository": {
@@ -20,5 +20,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1a7e6e0f4d048ba39e0ea66144e3551510ae46b1"
+  "gitHead": "c4e55ec01ed50e67f3cdf029685207a132cb4a27"
 }

package/src/preferences.spec.js

@@ -66,6 +66,13 @@ describe('Preferences', function () {
     }
 
     async function deleteAllValues() {
+        return setValueTo(undefined);
+    }
+
+    /**
+     * @param {any} value - A JSON value to write to the workspace preference file.
+     */
+    async function setValueTo(value) {
         const reference = await modelService.createModelReference(uri);
         if (reference.object.dirty) {
             await reference.object.revert();
@@ -73,7 +80,7 @@ describe('Preferences', function () {
         /** @type {import ('@theia/preferences/lib/browser/folder-preference-provider').FolderPreferenceProvider} */
         const provider = Array.from(folderPreferences['providers'].values()).find(candidate => candidate.getConfigUri().isEqual(uri));
         assert.isDefined(provider);
-        await provider['doSetPreference']('', [], undefined);
+        await provider['doSetPreference']('', [], value);
         reference.dispose();
     }
 
@@ -92,7 +99,10 @@ describe('Preferences', function () {
         if (!fileExistsBeforehand) {
             await fileService.delete(uri, { fromUserGesture: false }).catch(() => { });
         } else {
-            await fileService.write(uri, contentBeforehand);
+            let content = '';
+            try { content = JSON.parse(contentBeforehand); } catch { }
+            // Use the preference service because its promise is guaranteed to resolve after the file change is complete.
+            await setValueTo(content);
         }
     });
 

package/src/typescript.spec.js

@@ -48,6 +48,7 @@ describe('TypeScript', function () {
     const contextKeyService = container.get(ContextKeyService);
     const commands = container.get(CommandRegistry);
     const openerService = container.get(OpenerService);
+    /** @type {KeybindingRegistry} */
     const keybindings = container.get(KeybindingRegistry);
     /** @type {import('@theia/core/lib/browser/preferences/preference-service').PreferenceService} */
     const preferences = container.get(PreferenceService);
@@ -108,11 +109,12 @@ describe('TypeScript', function () {
     /**
      * @param {() => Promise<unknown> | unknown} condition
      * @param {number | undefined} [timeout]
+     * @param {string | undefined} [message]
      * @returns {Promise<void>}
      */
-    function waitForAnimation(condition, timeout) {
-        const success = new Promise(async (resolve, dispose) => {
-            toTearDown.push({ dispose });
+    function waitForAnimation(condition, timeout, message) {
+        const success = new Promise(async (resolve, reject) => {
+            toTearDown.push({ dispose: () => reject(message ?? 'Test terminated before resolution.') });
             do {
                 await animationFrame();
             } while (!condition());
@@ -120,8 +122,8 @@ describe('TypeScript', function () {
         });
         if (timeout !== undefined) {
             const timedOut = new Promise((_, fail) => {
-                const toClear = setTimeout(() => fail(new Error('Wait for animation timed out.')), timeout);
-                toTearDown.push({ dispose: () => (fail(new Error('Wait for animation timed out.')), clearTimeout(toClear)) });
+                const toClear = setTimeout(() => fail(new Error(message ?? 'Wait for animation timed out.')), timeout);
+                toTearDown.push({ dispose: () => (fail(new Error(message ?? 'Wait for animation timed out.')), clearTimeout(toClear)) });
             });
             return Promise.race([success, timedOut]);
         }
@@ -277,6 +279,7 @@ describe('TypeScript', function () {
             const from = 'an editor' + (preview ? ' preview' : '');
             it('within ' + from, async function () {
                 const editor = await openEditor(demoFileUri, preview);
+                editor.getControl().revealLine(24);
                 // const demoInstance = new Demo|Class('demo');
                 editor.getControl().setPosition({ lineNumber: 24, column: 30 });
                 assert.equal(editor.getControl().getModel().getWordAtPosition(editor.getControl().getPosition()).word, 'DemoClass');
@@ -299,6 +302,7 @@ describe('TypeScript', function () {
                 await editorManager.open(definitionFileUri, { mode: 'open' });
 
                 const editor = await openEditor(demoFileUri, preview);
+                editor.getControl().revealLine(32);
                 // const bar: Defined|Interface = { coolField: [] };
                 editor.getControl().setPosition({ lineNumber: 32, column: 19 });
                 assert.equal(editor.getControl().getModel().getWordAtPosition(editor.getControl().getPosition()).word, 'DefinedInterface');
@@ -319,6 +323,7 @@ describe('TypeScript', function () {
 
             it(`from ${from} to an editor preview`, async function () {
                 const editor = await openEditor(demoFileUri);
+                editor.getControl().revealLine(32);
                 // const bar: Defined|Interface = { coolField: [] };
                 editor.getControl().setPosition({ lineNumber: 32, column: 19 });
                 assert.equal(editor.getControl().getModel().getWordAtPosition(editor.getControl().getPosition()).word, 'DefinedInterface');
@@ -729,5 +734,4 @@ SPAN {
             assert.equal(getResultText(), expectedMessage);
         });
     }
-
 });

package/src/undo-redo-selectAll.spec.js

@@ -67,7 +67,7 @@ describe('Undo, Redo and Select All', function () {
     let originalValue = undefined;
     before(async () => {
         originalValue = preferenceService.inspect('files.autoSave').globalValue;
-        await preferenceService.set('files.autoSave', false, PreferenceScope.User);
+        await preferenceService.set('files.autoSave', 'off', PreferenceScope.User);
         shell.leftPanelHandler.collapse();
     });