From 45418113e051b777f8bd8092920c71a07ae5191d Mon Sep 17 00:00:00 2001 From: lauramekaj1 <165822427+lauramekaj1@users.noreply.github.com> Date: Mon, 27 Oct 2025 17:22:41 +0100 Subject: [PATCH 1/6] fix failing test --- tests/cypress/e2e/Entries/EntriesPageDataValidations.cy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cypress/e2e/Entries/EntriesPageDataValidations.cy.js b/tests/cypress/e2e/Entries/EntriesPageDataValidations.cy.js index 5853fa49ec..3631d9bd57 100644 --- a/tests/cypress/e2e/Entries/EntriesPageDataValidations.cy.js +++ b/tests/cypress/e2e/Entries/EntriesPageDataValidations.cy.js @@ -73,7 +73,7 @@ describe( 'Entries submitted from a form', () => { cy.get( '.frm_form_nav > :nth-child(1) > a' ).should( 'contain', 'Build' ).click(); cy.get( "a[aria-label='Close']", { timeout: 5000 } ).click( { force: true } ); cy.log( 'Verify that entries are not allowed from the forms list' ); - cy.get( 'td[data-colname="Entries"] svg[data-original-title="Saving entries is disabled for this form"]' ).should( 'exist' ); + cy.get( 'td[data-colname="Entries"] svg[title="Saving entries is disabled for this form"]' ).should( 'exist' ); } ); it( 'should be stored and validated in the entry list', () => { From 56135929c081735cd8d958cafdf8b19d10435e4e Mon Sep 17 00:00:00 2001 From: lauramekaj1 <165822427+lauramekaj1@users.noreply.github.com> Date: Tue, 28 Oct 2025 21:00:29 +0100 Subject: [PATCH 2/6] update form builder tests --- .../e2e/Forms/fieldsInFormBuilder.cy.js | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js b/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js index 30bb1a63d9..ea34fe8247 100644 --- a/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js +++ b/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js @@ -19,13 +19,23 @@ describe( 'Fields in the form builder', () => { return { originalField, duplicateField }; }; - const removeField = field => { - field.within( () => { - cy.get( '.frm-field-action-icons > .dropdown > .frm_bstooltip > .frmsvg > use' ).click( { force: true } ); - cy.get( '.frm-dropdown-menu > :nth-child(1) > .frm_delete_field' ).should( 'contain', 'Delete' ).click( { force: true } ); - } ); - cy.get( '.postbox a[id="frm-confirmed-click"]' ).contains( 'Confirm' ).should( 'be.visible' ).click( { force: true } ); - cy.get( `li[data-type="${ field }"]` ).should( 'not.exist' ); + const removeField = (field) => { + field.within(() => { + cy.get( '.frm-field-action-icons .dropdown' ) + .trigger( 'mouseover' ); + cy.get( '.frm-field-action-icons .dropdown .frm-hover-icon .frmsvg' ) + .click({ force: true }); + cy.get( '.frm-dropdown-menu .frm_delete_field' ) + .should( 'contain', 'Delete' ) + .click({ force: true }); + }); + + cy.get( '.postbox a[id="frm-confirmed-click"]' ) + .contains( 'Confirm' ) + .should( 'be.visible' ) + .click({ force: true }); + + cy.get( `li[data-type="${field}"]` ).should( 'not.exist' ); }; cy.contains( '#the-list tr', 'Test Form' ).trigger( 'mouseover' ).then( $row => { @@ -239,9 +249,9 @@ describe( 'Fields in the form builder', () => { cy.go( 'back' ); } ); - afterEach( () => { - cy.log( 'Teardown - Save the form and delete it' ); - cy.get( "a[aria-label='Close']", { timeout: 5000 } ).click( { force: true } ); - cy.deleteForm(); + // afterEach( () => { + // cy.log( 'Teardown - Save the form and delete it' ); + // cy.get( "a[aria-label='Close']", { timeout: 10000 } ).click( { force: true } ); + // cy.deleteForm(); } ); -} ); + From 630bb7f96befe7a2e30eeb284b9a02b083dcd264 Mon Sep 17 00:00:00 2001 From: lauramekaj1 <165822427+lauramekaj1@users.noreply.github.com> Date: Tue, 28 Oct 2025 21:26:22 +0100 Subject: [PATCH 3/6] add teardown --- tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js b/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js index ea34fe8247..1def829fd6 100644 --- a/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js +++ b/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js @@ -249,9 +249,9 @@ describe( 'Fields in the form builder', () => { cy.go( 'back' ); } ); - // afterEach( () => { - // cy.log( 'Teardown - Save the form and delete it' ); - // cy.get( "a[aria-label='Close']", { timeout: 10000 } ).click( { force: true } ); - // cy.deleteForm(); + afterEach( () => { + cy.log( 'Teardown - Save the form and delete it' ); + cy.get( "a[aria-label='Close']", { timeout: 10000 } ).click( { force: true } ); + cy.deleteForm(); } ); - +} ); From 033bfcc0ca94d4a8025ab8084ce0019e474dea04 Mon Sep 17 00:00:00 2001 From: lauramekaj1 <165822427+lauramekaj1@users.noreply.github.com> Date: Tue, 28 Oct 2025 21:36:07 +0100 Subject: [PATCH 4/6] fix eslint errors --- .../e2e/Forms/fieldsInFormBuilder.cy.js | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js b/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js index 1def829fd6..98e977f746 100644 --- a/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js +++ b/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js @@ -19,25 +19,28 @@ describe( 'Fields in the form builder', () => { return { originalField, duplicateField }; }; - const removeField = (field) => { - field.within(() => { - cy.get( '.frm-field-action-icons .dropdown' ) - .trigger( 'mouseover' ); - cy.get( '.frm-field-action-icons .dropdown .frm-hover-icon .frmsvg' ) - .click({ force: true }); - cy.get( '.frm-dropdown-menu .frm_delete_field' ) - .should( 'contain', 'Delete' ) - .click({ force: true }); - }); - - cy.get( '.postbox a[id="frm-confirmed-click"]' ) - .contains( 'Confirm' ) - .should( 'be.visible' ) - .click({ force: true }); - - cy.get( `li[data-type="${field}"]` ).should( 'not.exist' ); + const removeField = ( field ) => { + field.within( () => { + cy.get( '.frm-field-action-icons .dropdown' ) + .trigger( 'mouseover' ); + + cy.get( '.frm-field-action-icons .dropdown .frm-hover-icon .frmsvg' ) + .click( { force: true } ); + + cy.get( '.frm-dropdown-menu .frm_delete_field' ) + .should( 'contain', 'Delete' ) + .click( { force: true } ); + } ); + + cy.get( '.postbox a[id="frm-confirmed-click"]' ) + .contains( 'Confirm' ) + .should( 'be.visible' ) + .click( { force: true } ); + + cy.get( `li[data-type="${ field }"]` ).should( 'not.exist' ); }; + cy.contains( '#the-list tr', 'Test Form' ).trigger( 'mouseover' ).then( $row => { cy.wrap( $row ).within( () => { cy.get( '.column-name .row-title' ).should( 'exist' ).and( 'be.visible' ).then( $elem => { From 7a30a18c7cf5eea7bd0f05c4bf2647959bb70ff7 Mon Sep 17 00:00:00 2001 From: lauramekaj1 <165822427+lauramekaj1@users.noreply.github.com> Date: Tue, 28 Oct 2025 21:45:06 +0100 Subject: [PATCH 5/6] fixed eslint errors --- .../e2e/Forms/fieldsInFormBuilder.cy.js | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js b/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js index 98e977f746..020b997e9b 100644 --- a/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js +++ b/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js @@ -19,27 +19,26 @@ describe( 'Fields in the form builder', () => { return { originalField, duplicateField }; }; - const removeField = ( field ) => { - field.within( () => { - cy.get( '.frm-field-action-icons .dropdown' ) - .trigger( 'mouseover' ); - - cy.get( '.frm-field-action-icons .dropdown .frm-hover-icon .frmsvg' ) - .click( { force: true } ); - - cy.get( '.frm-dropdown-menu .frm_delete_field' ) - .should( 'contain', 'Delete' ) - .click( { force: true } ); - } ); - - cy.get( '.postbox a[id="frm-confirmed-click"]' ) - .contains( 'Confirm' ) - .should( 'be.visible' ) - .click( { force: true } ); - - cy.get( `li[data-type="${ field }"]` ).should( 'not.exist' ); - }; - + const removeField = field => { + field.within( () => { + cy.get( '.frm-field-action-icons .dropdown' ) + .trigger( 'mouseover' ); + + cy.get( '.frm-field-action-icons .dropdown .frm-hover-icon .frmsvg' ) + .click( { force: true } ); + + cy.get( '.frm-dropdown-menu .frm_delete_field' ) + .should( 'contain', 'Delete' ) + .click( { force: true } ); + }); + + cy.get( '.postbox a[id="frm-confirmed-click"]' ) + .contains( 'Confirm' ) + .should( 'be.visible' ) + .click( { force: true } ); + + cy.get( `li[data-type="${ field }"]` ).should( 'not.exist' ); +}; cy.contains( '#the-list tr', 'Test Form' ).trigger( 'mouseover' ).then( $row => { cy.wrap( $row ).within( () => { From 3061c8d9054973f2805584122c10060ff96fc9ae Mon Sep 17 00:00:00 2001 From: lauramekaj1 <165822427+lauramekaj1@users.noreply.github.com> Date: Tue, 28 Oct 2025 21:55:44 +0100 Subject: [PATCH 6/6] fix eslint check --- tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js b/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js index 020b997e9b..5bfb99f95b 100644 --- a/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js +++ b/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js @@ -30,7 +30,7 @@ describe( 'Fields in the form builder', () => { cy.get( '.frm-dropdown-menu .frm_delete_field' ) .should( 'contain', 'Delete' ) .click( { force: true } ); - }); + } ); cy.get( '.postbox a[id="frm-confirmed-click"]' ) .contains( 'Confirm' ) @@ -38,7 +38,7 @@ describe( 'Fields in the form builder', () => { .click( { force: true } ); cy.get( `li[data-type="${ field }"]` ).should( 'not.exist' ); -}; + }; cy.contains( '#the-list tr', 'Test Form' ).trigger( 'mouseover' ).then( $row => { cy.wrap( $row ).within( () => {