fix: e2e

Author: younocode

apps/nestjs-backend/test/base-duplicate.e2e-spec.ts

@@ -92,6 +92,7 @@ describe('OpenAPI Base Duplicate (e2e)', () => {
     await permanentDeleteBase(base.id);
     if (duplicateBaseId) {
       await permanentDeleteBase(duplicateBaseId);
+      duplicateBaseId = undefined;
     }
   });
 
@@ -604,7 +605,6 @@ describe('OpenAPI Base Duplicate (e2e)', () => {
       expect(baseResult.data.length).toBe(1);
 
       expect(tableResult.data.length).toBe(1);
-      await deleteBase(dupResult.data.id);
     });
   });
 
@@ -633,7 +633,7 @@ describe('OpenAPI Base Duplicate (e2e)', () => {
         spaceId: spaceId,
         name: 'test base copy',
       });
-
+      duplicateBaseId = dupResult.data.id;
       const newBaseId = dupResult.data.id;
 
       const dashboardList = (await getDashboardList(newBaseId)).data;
@@ -651,8 +651,6 @@ describe('OpenAPI Base Duplicate (e2e)', () => {
 
       expect(dashboardList.length).toBe(2);
       expect(installedPlugins.name).toBe('plugin1');
-
-      await deleteBase(dupResult.data.id);
     });
 
     it('should duplicate all panel plugins', async () => {
@@ -681,7 +679,7 @@ describe('OpenAPI Base Duplicate (e2e)', () => {
         spaceId: spaceId,
         name: 'test base copy',
       });
-
+      duplicateBaseId = dupResult.data.id;
       const panelList = (await listPluginPanels(pluginTable.id)).data;
 
       const panel1Info = (
@@ -699,8 +697,6 @@ describe('OpenAPI Base Duplicate (e2e)', () => {
       expect(panel1Info.layout?.length).toBe(2);
       expect(panelList.length).toBe(2);
       expect(installedPlugins.name).toBe('plugin1');
-
-      await deleteBase(dupResult.data.id);
     });
 
     it('should duplicate all view plugins', async () => {
@@ -719,7 +715,7 @@ describe('OpenAPI Base Duplicate (e2e)', () => {
         spaceId: spaceId,
         name: 'test base copy',
       });
-
+      duplicateBaseId = dupResult.data.id;
       const views = (await getViewList(tableId)).data;
 
       const pluginViews = views.filter(({ type }) => type === ViewType.Plugin);
@@ -728,8 +724,6 @@ describe('OpenAPI Base Duplicate (e2e)', () => {
 
       expect(pluginViews.find(({ name }) => name === sheetView1.name)).toBeDefined();
       expect(pluginViews.find(({ name }) => name === sheetView2.name)).toBeDefined();
-
-      await deleteBase(dupResult.data.id);
     });
   });
 });

apps/nestjs-backend/test/base-node.e2e-spec.ts

@@ -128,7 +128,7 @@ describe('BaseNodeController (e2e) /api/base/:baseId/node', () => {
 
     afterEach(async () => {
       // Cleanup created nodes
-      for (const nodeId of nodesToCleanup) {
+      for (const nodeId of [...nodesToCleanup].reverse()) {
         await deleteBaseNode(baseId, nodeId);
       }
       nodesToCleanup.length = 0;
@@ -404,7 +404,7 @@ describe('BaseNodeController (e2e) /api/base/:baseId/node', () => {
     const nodesToCleanup: string[] = [];
 
     afterEach(async () => {
-      for (const nodeId of nodesToCleanup) {
+      for (const nodeId of [...nodesToCleanup].reverse()) {
         await deleteBaseNode(baseId, nodeId);
       }
       nodesToCleanup.length = 0;
@@ -686,7 +686,7 @@ describe('BaseNodeController (e2e) /api/base/:baseId/node', () => {
     const nodesToCleanup: string[] = [];
 
     afterEach(async () => {
-      for (const nodeId of nodesToCleanup) {
+      for (const nodeId of [...nodesToCleanup].reverse()) {
         await deleteBaseNode(baseId, nodeId);
       }
       nodesToCleanup.length = 0;
@@ -756,7 +756,7 @@ describe('BaseNodeController (e2e) /api/base/:baseId/node', () => {
     const nodesToCleanup: string[] = [];
 
     afterEach(async () => {
-      for (const nodeId of nodesToCleanup) {
+      for (const nodeId of [...nodesToCleanup].reverse()) {
         await deleteBaseNode(baseId, nodeId);
       }
       nodesToCleanup.length = 0;
@@ -1127,12 +1127,8 @@ describe('BaseNodeController (e2e) /api/base/:baseId/node', () => {
 
     afterAll(async () => {
       // Cleanup nodes first
-      for (const nodeId of nodesToCleanup) {
-        try {
-          await deleteBaseNode(permissionBaseId, nodeId);
-        } catch (e) {
-          // Ignore cleanup errors
-        }
+      for (const nodeId of [...nodesToCleanup].reverse()) {
+        await deleteBaseNode(permissionBaseId, nodeId);
       }
       // Then delete the space (which will delete the base)
       await apiPermanentDeleteSpace(permissionSpaceId);
@@ -1339,7 +1335,7 @@ describe('BaseNodeController (e2e) /api/base/:baseId/node', () => {
       const creatorNodesToCleanup: string[] = [];
 
       afterEach(async () => {
-        for (const nodeId of creatorNodesToCleanup) {
+        for (const nodeId of [...creatorNodesToCleanup].reverse()) {
           await deleteBaseNode(permissionBaseId, nodeId);
         }
         creatorNodesToCleanup.length = 0;