@theia/api-tests 1.50.1 → 1.52.0

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@theia/api-tests",
-  "version": "1.50.1",
+  "version": "1.52.0",
   "description": "Theia API tests",
   "dependencies": {
-    "@theia/core": "1.50.1"
+    "@theia/core": "1.52.0"
   },
   "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0",
   "repository": {
@@ -20,5 +20,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ffefc7ac2c0f6c63256042b7710551304200e5e1"
+  "gitHead": "40ceebcd4ee75f13ec16b9dc7314e9384493c1ac"
 }

package/src/menus.spec.js

@@ -44,8 +44,8 @@ describe('Menus', function () {
 
     const container = window.theia.container;
     const shell = container.get(ApplicationShell);
+    /** @type {BrowserMenuBarContribution} */
     const menuBarContribution = container.get(BrowserMenuBarContribution);
-    const menuBar = /** @type {import('@theia/core/lib/browser/menu/browser-menu-plugin').MenuBarWidget} */ (menuBarContribution.menuBar);
     const pluginService = container.get(HostedPluginSupport);
     const menus = container.get(MenuModelRegistry);
     const commands = container.get(CommandRegistry);
@@ -54,6 +54,9 @@ describe('Menus', function () {
     before(async function () {
         await pluginService.didStart;
         await pluginService.activateByViewContainer('explorer');
+        // Updating the menu interferes with our ability to programmatically test it
+        // We simply disable the menu updating
+        menus.isReady = false;
     });
 
     const toTearDown = new DisposableCollection();
@@ -73,7 +76,7 @@ describe('Menus', function () {
     ]) {
         it(`should toggle '${contribution.viewLabel}' view`, async () => {
             await contribution.closeView();
-            await menuBar.triggerMenuItem('View', contribution.viewLabel);
+            await menuBarContribution.menuBar.triggerMenuItem('View', contribution.viewLabel);
             await shell.waitForActivation(contribution.viewId);
         });
     }

package/src/typescript.spec.js

@@ -103,10 +103,9 @@ describe('TypeScript', function () {
         const editorWidget = widget instanceof EditorWidget ? widget : undefined;
         const editor = MonacoEditor.get(editorWidget);
         assert.isDefined(editor);
-        await timeout(1000); // workaround for https://github.com/eclipse-theia/theia/issues/13679
         // wait till tsserver is running, see:
         // https://github.com/microsoft/vscode/blob/93cbbc5cae50e9f5f5046343c751b6d010468200/extensions/typescript-language-features/src/extension.ts#L98-L103
-        // await waitForAnimation(() => contextKeyService.match('typescript.isManagedFile'));
+        await waitForAnimation(() => contextKeyService.match('typescript.isManagedFile'));
         // https://github.com/microsoft/vscode/blob/4aac84268c6226d23828cc6a1fe45ee3982927f0/extensions/typescript-language-features/src/typescriptServiceClient.ts#L911
         await waitForAnimation(() => !progressStatusBarItem.currentProgress);
         return /** @type {MonacoEditor} */ (editor);

package/src/views.spec.js

@@ -14,6 +14,8 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
+const { timeout } = require('@theia/core/lib/common/promise-util');
+
 // @ts-check
 describe('Views', function () {
     this.timeout(7500);
@@ -52,24 +54,26 @@ describe('Views', function () {
             if (view) {
                 assert.notEqual(shell.getAreaFor(view), contribution.defaultViewOptions.area);
                 assert.isFalse(view.isVisible);
-                assert.notEqual(view, shell.activeWidget);
+                assert.isTrue(view !== shell.activeWidget, `${contribution.viewLabel} !== shell.activeWidget`);
             }
 
             view = await contribution.toggleView();
-            assert.notEqual(view, undefined);
+            // we can't use "equals" here because Mocha chokes on the diff for certain widgets
+            assert.isTrue(view !== undefined, `${contribution.viewLabel}  !== undefined`);
             assert.equal(shell.getAreaFor(view), contribution.defaultViewOptions.area);
             assert.isDefined(shell.getTabBarFor(view));
             // @ts-ignore
             assert.equal(shell.getAreaFor(shell.getTabBarFor(view)), contribution.defaultViewOptions.area);
             assert.isTrue(view.isVisible);
-            assert.equal(view, shell.activeWidget);
+            assert.isTrue(view === shell.activeWidget, `${contribution.viewLabel}  === shell.activeWidget`);
 
             view = await contribution.toggleView();
+            await timeout(0); // seems that the "await" is not enought to guarantee that the panel is hidden
             assert.notEqual(view, undefined);
             assert.equal(shell.getAreaFor(view), contribution.defaultViewOptions.area);
             assert.isDefined(shell.getTabBarFor(view));
             assert.isFalse(view.isVisible);
-            assert.notEqual(view, shell.activeWidget);
+            assert.isTrue(view !== shell.activeWidget, `${contribution.viewLabel}  !== shell.activeWidget`);
         });
     }