fix broken test

Author: dididy

zeppelin-web-angular/e2e/models/base-page.ts

@@ -35,8 +35,20 @@ export class BasePage {
 
   async clickE2ETestFolder(): Promise<void> {
     await this.e2eTestFolder.waitFor({ state: 'visible', timeout: 30000 });
-    await this.e2eTestFolderSwitcher.locator('.ant-tree-switcher').click();
-    await this.e2eTestFolderSwitcher.locator('.ant-tree-switcher_open').waitFor({ state: 'visible' });
+
+    // Check if already open
+    const openSwitcher = this.e2eTestFolderSwitcher.locator('.ant-tree-switcher_open');
+    const isAlreadyOpen = await openSwitcher.isVisible();
+
+    if (!isAlreadyOpen) {
+      const switcher = this.e2eTestFolderSwitcher.locator('.ant-tree-switcher');
+      await switcher.waitFor({ state: 'visible' });
+      await switcher.click();
+
+      // Wait for the switcher to change to open state
+      await openSwitcher.waitFor({ state: 'visible', timeout: 10000 });
+    }
+
     await this.page.waitForLoadState('networkidle', { timeout: 15000 });
   }
 }

zeppelin-web-angular/e2e/models/folder-rename-page.ts

@@ -66,46 +66,29 @@ export class FolderRenamePage extends BasePage {
       })
     });
 
-    // Ensure folder node is visible (expand if needed)
-    if (!(await node.first().isVisible())) {
-      this.clickE2ETestFolder();
+    try {
+      await expect(node.first()).toBeVisible();
+    } catch {
+      await this.clickE2ETestFolder();
+      await expect(node.first()).toBeVisible();
     }
 
-    await expect(node.first()).toBeVisible();
     return node.first();
   }
 
   async hoverOverFolder(folderName: string): Promise<void> {
     // Wait for the folder list to be loaded
-    await this.page.waitForSelector('zeppelin-node-list', { state: 'visible' });
-
-    const rawNode = await this.getFolderNode(folderName);
+    await this.hoverOverFolder(folderName);
 
-    const folderNode = await rawNode
-      .locator('a.name', {
-        has: this.page.locator('i.anticon-folder'),
-        hasText: folderName
-      })
-      .first();
+    const folderNode = await this.getFolderNode(folderName);
 
-    // Ensure folder node is visible (expand if needed)
-    if (!(await folderNode.isVisible())) {
-      this.clickE2ETestFolder();
-      await folderNode.waitFor({ state: 'visible' });
+    // Hover over the entire folder node to trigger operation buttons
+    try {
+      await folderNode.hover();
+    } catch {
+      await this.clickE2ETestFolder();
+      await folderNode.hover();
     }
-
-    await folderNode.isVisible();
-    await folderNode.hover();
-
-    // Wait for hover effects to take place by checking for interactive elements
-    await this.page
-      .waitForSelector('.node a[nz-tooltip], .node i[nztype], .node button', {
-        state: 'visible',
-        timeout: 5000
-      })
-      .catch(() => {
-        console.log('No interactive elements found after hover, continuing...');
-      });
   }
 
   async clickDeleteIcon(folderName: string): Promise<void> {
@@ -114,15 +97,14 @@ export class FolderRenamePage extends BasePage {
 
     const folderNode = await this.getFolderNode(folderName);
 
-    // Ensure folder node is visible (expand if needed)
-    if (!(await folderNode.isVisible())) {
-      this.clickE2ETestFolder();
-      await folderNode.waitFor({ state: 'visible' });
+    // Hover over the entire folder node to trigger operation buttons
+    try {
+      await folderNode.hover();
+    } catch {
+      await this.clickE2ETestFolder();
+      await folderNode.hover();
     }
 
-    await folderNode.isVisible();
-    await folderNode.hover();
-
     const deleteIcon = folderNode.locator('.folder .operation a[nz-tooltip][nztooltiptitle="Move folder to Trash"]');
     await deleteIcon.click();
   }

zeppelin-web-angular/e2e/models/folder-rename-page.util.ts

@@ -124,7 +124,12 @@ export class FolderRenamePageUtil {
 
     // Verify the original folder still exists and was not renamed or deleted.
     const originalFolderLocator = this.page.locator('.folder .name', { hasText: folderName });
-    await expect(originalFolderLocator).toBeVisible({ timeout: 5000 });
+    try {
+      await expect(originalFolderLocator).toBeVisible({ timeout: 5000 });
+    } catch {
+      await this.folderRenamePage.clickE2ETestFolder();
+      await expect(originalFolderLocator).toBeVisible({ timeout: 5000 });
+    }
   }
 
   async verifyDeleteIconIsDisplayed(folderName: string): Promise<void> {