Try to stablize tests that check for deleted elements in the explorer

CrossBreezeNL · Nov 22, 2024 · 5dd062e · 5dd062e
1 parent ff0cf0f
commit 5dd062e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/e2e-tests/src/page-objects/cm-explorer-view.ts b/e2e-tests/src/page-objects/cm-explorer-view.ts
@@ -1,7 +1,7 @@
 /********************************************************************************
  * Copyright (c) 2023 CrossBreeze.
  ********************************************************************************/
-import { TheiaApp, TheiaExplorerView } from '@theia/playwright';
+import { TheiaApp, TheiaExplorerFileStatNode, TheiaExplorerView } from '@theia/playwright';
 import { CMMTabBarToolbar } from './cm-tab-bar-toolbar';
 
 export class CMExplorerView extends TheiaExplorerView {
@@ -11,4 +11,19 @@ export class CMExplorerView extends TheiaExplorerView {
       super(app);
       this.tabBarToolbar = new CMMTabBarToolbar(this);
    }
+
+   /**
+    * The `existsFileNode` method implementation of the `TheiaExplorerView` PO don't
+    * behave as expected. If a node does not exist they will throw an errors instead of
+    * returning `false`.
+    * This method is a workaround and allows us to quickly check if a file node is visible
+    */
+   async findTreeNode(path: string): Promise<TheiaExplorerFileStatNode | undefined> {
+      const fullPathSelector = this.treeNodeSelector(path);
+      const treeNodeElement = await this.page.$(fullPathSelector);
+      if (treeNodeElement) {
+         return new TheiaExplorerFileStatNode(treeNodeElement, this);
+      }
+      return undefined;
+   }
 }
diff --git a/e2e-tests/src/tests/diagram/system/add-edit-delete-relationship.spec.ts b/e2e-tests/src/tests/diagram/system/add-edit-delete-relationship.spec.ts
@@ -90,6 +90,6 @@ test.describe.serial('Add/Edit/Delete relationship in a diagram ', () => {
       expect(await diagramCodeEditor.numberOfLines()).toBe(11);
 
       const explorer = await app.openExplorerView();
-      expect(await explorer.existsFileNode(NEW_RELATIONSHIP_PATH)).toBeFalsy();
+      expect(await explorer.findTreeNode(NEW_RELATIONSHIP_PATH)).toBeUndefined();
    });
 });
diff --git a/e2e-tests/src/tests/form/add-edit-delete-entity.spec.ts b/e2e-tests/src/tests/form/add-edit-delete-entity.spec.ts
@@ -84,7 +84,6 @@ test.describe('Add/Edit/Delete entity from explorer', () => {
       const fileStatElements = await explorer.visibleFileStatNodes();
       await explorer.deleteNode(NEW_ENTITY2_PATH);
       await explorer.waitForFileNodesToDecrease(fileStatElements.length);
-      const updatedFileStatElements = await explorer.visibleFileStatNodes();
-      expect(updatedFileStatElements).toHaveLength(fileStatElements.length - 2);
+      expect(await explorer.findTreeNode(NEW_ENTITY2_PATH)).toBeUndefined();
    });
 });
diff --git a/e2e-tests/src/tests/form/add-edit-delete-relationship.spec.ts b/e2e-tests/src/tests/form/add-edit-delete-relationship.spec.ts
@@ -71,11 +71,9 @@ test.describe('Add/Edit/Delete relationship from explorer', () => {
 
    test('Delete relationship via context menu', async () => {
       const explorer = await app.openExplorerView();
-      await explorer.getFileStatNodeByLabel('ExampleCRM/relationships');
       const fileStatElements = await explorer.visibleFileStatNodes();
       await explorer.deleteNode(NEW_RELATIONSHIP_PATH);
       await explorer.waitForFileNodesToDecrease(fileStatElements.length);
-      const updatedFileStatElements = await explorer.visibleFileStatNodes();
-      expect(updatedFileStatElements).toHaveLength(fileStatElements.length - 1);
+      expect(await explorer.findTreeNode(NEW_RELATIONSHIP_PATH)).toBeUndefined();
    });
 });