Merge pull request #7256 from microting/copilot/fix-aftereach-visual-editor-tests

Fix afterEach cleanup pattern in Cypress visual editor tests

Author: renemadsen

eform-client/cypress/e2e/MyEforms.page.ts

@@ -159,20 +159,26 @@ class MyEformsPage extends PageWithNavbarPage {
 
   public clearEFormTable() {
     cy.wait(500);
-    const rowCount = this.rowNum();
-    let indexForDelete = 1;
-    for (let i = 1; i <= rowCount; i++) {
-      const eformsRowObject = this.getEformRowObj(i, false);
-      if (
-        eformsRowObject &&
-        eformsRowObject.deleteBtn &&
-        (eformsRowObject.deleteBtn.should('be.visible'))
-      ) {
-        eformsRowObject.deleteEForm();
-      } else {
-        indexForDelete += 1;
+    // Check if table has any rows before trying to delete
+    cy.get('body').then($body => {
+      if ($body.find('.eform-id').length > 0) {
+        // Table has rows, delete them
+        cy.get('.eform-id').its('length').then((rowCount) => {
+          for (let i = 1; i <= rowCount; i++) {
+            const eformsRowObject = this.getEformRowObj(1, false); // Always delete first row
+            if (
+              eformsRowObject &&
+              eformsRowObject.deleteBtn
+            ) {
+              eformsRowObject.deleteBtn.should('be.visible').click();
+              cy.wait(500);
+              cy.get('#eFormDeleteDeleteBtn').should('be.visible').click();
+              cy.wait(500);
+            }
+          }
+        });
       }
-    }
+    });
   }
 
   createNewEform(

eform-client/cypress/e2e/j/eform-visual-editor.create-eform.spec.cy.ts

@@ -1,5 +1,9 @@
 import loginPage from '../Login.page';
 import {generateRandmString, getRandomInt, selectValueInNgSelectorNoSelector} from '../helper-functions';
+import { Navbar } from '../Navbar.page';
+import { myEformsPage } from '../MyEforms.page';
+
+const navbar = new Navbar();
 
 describe('Visual editor - Create eForm', () => {
   beforeEach(() => {
@@ -684,10 +688,7 @@ describe('Visual editor - Create eForm', () => {
 
   afterEach(() => {
     // Clean up - delete created eForm
-    cy.get('#cancelEditBtn').click();
-    cy.wait(500);
-    cy.get('#delete-eform-btn-0').click();
-    cy.get('#eFormDeleteDeleteBtn').click();
-    cy.wait(1000);
+    navbar.goToMyEForms();
+    myEformsPage.clearEFormTable();
   });
 });

eform-client/cypress/e2e/j/eform-visual-editor.edit-eform.spec.cy.ts

@@ -1,5 +1,9 @@
 import loginPage from '../Login.page';
 import {selectValueInNgSelectorNoSelector} from '../helper-functions';
+import { Navbar } from '../Navbar.page';
+import { myEformsPage } from '../MyEforms.page';
+
+const navbar = new Navbar();
 
 
 // @ts-ignore
@@ -510,10 +514,8 @@ describe('My eforms', () => {
   // });
 
   afterEach(() => {
-    /* ==== Generated with Cypress Studio ==== */
-    cy.get('#cancelEditBtn').click();
-    cy.get('#delete-eform-btn-0').click();
-    cy.get('#eFormDeleteDeleteBtn').click();
-    /* ==== End Cypress Studio ==== */
+    // Clean up - delete created eForm
+    navbar.goToMyEForms();
+    myEformsPage.clearEFormTable();
   });
 });

eform-client/cypress/e2e/j/eform-visual-editor.edit-xml.spec.cy.ts

@@ -1,4 +1,8 @@
 import loginPage from '../Login.page';
+import { Navbar } from '../Navbar.page';
+import { myEformsPage } from '../MyEforms.page';
+
+const navbar = new Navbar();
 
 
 // @ts-ignore
@@ -79,10 +83,8 @@ describe('My eforms', () => {
   // });
 
   afterEach(() => {
-    /* ==== Generated with Cypress Studio ==== */
-    cy.get('#cancelEditBtn').click();
-    cy.get('#delete-eform-btn-0 > .mat-button-wrapper > .mat-icon').click();
-    cy.get('#eFormDeleteDeleteBtn > .mat-button-wrapper').click();
-    /* ==== End Cypress Studio ==== */
+    // Clean up - delete created eForm
+    navbar.goToMyEForms();
+    myEformsPage.clearEFormTable();
   });
 });

eform-client/cypress/e2e/j/eform-visual-editor.multi-language.spec.cy.ts

@@ -1,4 +1,8 @@
 import loginPage from '../Login.page';
+import { Navbar } from '../Navbar.page';
+import { myEformsPage } from '../MyEforms.page';
+
+const navbar = new Navbar();
 
 // @ts-ignore
 describe('My eforms', () => {
@@ -69,10 +73,8 @@ describe('My eforms', () => {
   // });
 
   afterEach(() => {
-    /* ==== Generated with Cypress Studio ==== */
-    cy.get('#cancelEditBtn').click();
-    cy.get('#delete-eform-btn-0 > .mat-button-wrapper > .mat-icon').click();
-    cy.get('#eFormDeleteDeleteBtn > .mat-button-wrapper').click();
-    /* ==== End Cypress Studio ==== */
+    // Clean up - delete created eForm
+    navbar.goToMyEForms();
+    myEformsPage.clearEFormTable();
   });
 });