refactor teardown step about delete note

Author: dididy

zeppelin-web-angular/e2e/global-teardown.ts

@@ -18,9 +18,10 @@ async function globalTeardown() {
   LoginTestUtil.resetCache();
   console.log('✅ Test cache cleared');
 
-  // Clean up based on test notebook directory configuration
+  // Clean up test notebooks
+  // CI: Uses ZEPPELIN_E2E_TEST_NOTEBOOK_DIR which gets cleaned up by workflow
+  // Local: Uses API-based cleanup to avoid server restart required for directory changes
   if (!process.env.CI) {
-    // Use dedicated test directory (typically in CI)
     await cleanupTestNotebooks();
   }
 }
@@ -35,15 +36,30 @@ async function cleanupTestNotebooks() {
     const response = await fetch(`${baseURL}/api/notebook`);
     const data = await response.json();
 
+    // Debug: Log the API response structure
+    console.log('🔍 API Response structure:', JSON.stringify(data, null, 2));
+
     if (!data.body || !Array.isArray(data.body)) {
       console.log('No notebooks found or invalid response format');
       return;
     }
 
-    // Filter notebooks that start with "Test Notebook" (created by createTestNotebook)
-    const testNotebooks = data.body.filter(
-      (notebook: { path: string }) => notebook.path && notebook.path.startsWith('/Test Notebook ')
-    );
+    // Debug: Log individual notebook structure
+    if (data.body.length > 0) {
+      console.log('🔍 Sample notebook structure:', JSON.stringify(data.body[0], null, 2));
+    }
+
+    // Simple filter for test notebooks and folders with unified naming
+    const isTestItem = (item: { id: string; path: string }) => {
+      const path = item.path || '';
+      // Match test items by Date.now() pattern (13-digit timestamp)
+      const hasTimestamp = /\d{13}/.test(path);
+      const isTestPattern =
+        path.includes('TestNotebook_') || path.includes('TestFolder_') || path.includes('TestFolderRenamed_');
+      return hasTimestamp && isTestPattern;
+    };
+
+    const testNotebooks = data.body.filter(isTestItem);
 
     if (testNotebooks.length === 0) {
       console.log('✅ No test notebooks to clean up via API');

zeppelin-web-angular/e2e/tests/notebook/action-bar/action-bar-functionality.spec.ts

@@ -40,7 +40,7 @@ test.describe('Notebook Action Bar Functionality', () => {
   test('should display and allow title editing with tooltip', async ({ page }) => {
     // Then: Title editor should be functional with proper tooltip
     const actionBarUtil = new NotebookActionBarUtil(page);
-    const notebookName = `Test Notebook ${Date.now()}`;
+    const notebookName = `TestNotebook_${Date.now()}`;
     await actionBarUtil.verifyTitleEditingFunctionality(notebookName);
   });
 

zeppelin-web-angular/e2e/tests/share/folder-rename/folder-rename.spec.ts

@@ -62,7 +62,7 @@ test.describe.serial('Folder Rename', () => {
   });
 
   test('Given rename modal is open, When entering new name and confirming, Then folder should be renamed', async () => {
-    const renamedFolderName = `RenamedFolder_${test.info().project.name}_${Date.now()}`;
+    const renamedFolderName = `TestFolderRenamed_${Date.now()}`;
     await folderRenameUtil.verifyFolderCanBeRenamed(testFolderName, renamedFolderName);
   });
 
@@ -94,7 +94,7 @@ test.describe.serial('Folder Rename', () => {
   test('Given folder is renamed, When checking folder list, Then old name should not exist and new name should exist', async ({
     page
   }) => {
-    const renamedFolderName = `RenamedFolder_${test.info().project.name}_${Date.now()}`;
+    const renamedFolderName = `TestFolderRenamed_${Date.now()}`;
     await folderRenamePage.hoverOverFolder(testFolderName);
     await folderRenamePage.clickRenameMenuItem(testFolderName);
     await folderRenamePage.clearNewName();

zeppelin-web-angular/e2e/utils.ts

@@ -395,7 +395,7 @@ export async function createTestNotebook(
   folderPath?: string
 ): Promise<{ noteId: string; paragraphId: string }> {
   const notebookUtil = new NotebookUtil(page);
-  const baseNotebookName = `Test Notebook ${Date.now()}`;
+  const baseNotebookName = `TestNotebook_${Date.now()}`;
   const notebookName = folderPath ? `${folderPath}/${baseNotebookName}` : baseNotebookName;
 
   try {