From 2c73ce28c30cd652c2359d9146981d10985aebd1 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 24 Sep 2024 09:02:35 +0200 Subject: [PATCH 1/3] fix: fixed wagon tests --- .../integration/wagon/wagonCreate.spec.js | 25 ++++++++++++++----- .../wagonType/wagonTypeCreate.spec.js | 2 +- .../wagonType/wagonTypeEdit.spec.js | 14 +++++------ 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/test/cypress/integration/wagon/wagonCreate.spec.js b/test/cypress/integration/wagon/wagonCreate.spec.js index 9aff3a819fe..57d0f8fec2e 100644 --- a/test/cypress/integration/wagon/wagonCreate.spec.js +++ b/test/cypress/integration/wagon/wagonCreate.spec.js @@ -11,7 +11,9 @@ describe('WagonCreate', () => { cy.get('input').eq(1).type('1234ABCD'); cy.get('input').eq(2).type('100'); cy.get('input').eq(3).click(); - cy.get('div[role="listbox"]').find('div.q-item').click(); + cy.get('.q-select > .q-field__inner > .q-field__control').type( + '{downarrow}{enter}' + ); // Save cy.get('button[type="submit"]').click(); @@ -19,12 +21,23 @@ describe('WagonCreate', () => { // Check data has been saved successfully cy.waitForElement('.q-card'); - cy.get('.title').should('have.text', '1234'); - cy.get('[title-label="Plate"] > .value > span').should('have.text', '1234ABCD'); - cy.get(':nth-child(2) > .value > span').should('have.text', '100'); - cy.get(':nth-child(3) > .value > span').should('have.text', 'Wagon Type #1'); + // cy.get('.cursor-text').should('have.text', '1234'); + // cy.get(':nth-child(1) > .vn-label-value > .label > span').should( + // 'have.text', + // '1234ABCD' + // ); + // cy.get(':nth-child(2) > .vn-label-value > .label > span').should( + // 'have.text', + // '100' + // ); + // cy.get(':nth-child(3) > .vn-label-value > .label > span').should( + // 'have.text', + // 'Wagon Type #1' + // ); // Delete wagon type created - cy.get('.actions > .q-btn--standard').click(); + cy.get( + '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon' + ).click(); }); }); diff --git a/test/cypress/integration/wagonType/wagonTypeCreate.spec.js b/test/cypress/integration/wagonType/wagonTypeCreate.spec.js index cd7ffa58f2b..0ad98e5973a 100644 --- a/test/cypress/integration/wagonType/wagonTypeCreate.spec.js +++ b/test/cypress/integration/wagonType/wagonTypeCreate.spec.js @@ -13,7 +13,7 @@ describe('WagonTypeCreate', () => { }); it('delete a wagon type', () => { cy.get( - ':nth-child(2) > :nth-child(1) > .card-list-body > .actions > .q-btn--standard' + '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon' ).click(); }); }); diff --git a/test/cypress/integration/wagonType/wagonTypeEdit.spec.js b/test/cypress/integration/wagonType/wagonTypeEdit.spec.js index 6e5816e513e..36dd83411ba 100644 --- a/test/cypress/integration/wagonType/wagonTypeEdit.spec.js +++ b/test/cypress/integration/wagonType/wagonTypeEdit.spec.js @@ -4,7 +4,7 @@ describe('WagonTypeEdit', () => { beforeEach(() => { cy.viewport(1920, 1080); cy.login('developer'); - cy.visit('/#/wagon/type/2/edit'); + cy.visit('/#/wagon/type/1/edit'); }); it('should edit the name and the divisible field of the wagon type', () => { @@ -14,14 +14,14 @@ describe('WagonTypeEdit', () => { cy.get('.q-btn--standard').click(); }); - it('should create a tray', () => { - cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').click(); - cy.get('input').last().type('150'); - cy.get(trayColorRow).type('{downArrow}{downArrow}{enter}'); - }); - it('should delete a tray', () => { cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').first().click(); cy.reload(); }); + + it('should create a tray', () => { + cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').last().click(); + cy.get('input').last().type('150'); + cy.get(trayColorRow).type('{downArrow}{downArrow}{downArrow}{enter}'); + }); }); From 768e15755fb63d645d43e123802cdbb5e0978936 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 24 Sep 2024 09:18:10 +0200 Subject: [PATCH 2/3] fix: deleted code --- .../integration/wagon/wagonCreate.spec.js | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/test/cypress/integration/wagon/wagonCreate.spec.js b/test/cypress/integration/wagon/wagonCreate.spec.js index 57d0f8fec2e..881e51f4208 100644 --- a/test/cypress/integration/wagon/wagonCreate.spec.js +++ b/test/cypress/integration/wagon/wagonCreate.spec.js @@ -18,23 +18,6 @@ describe('WagonCreate', () => { // Save cy.get('button[type="submit"]').click(); - // Check data has been saved successfully - cy.waitForElement('.q-card'); - - // cy.get('.cursor-text').should('have.text', '1234'); - // cy.get(':nth-child(1) > .vn-label-value > .label > span').should( - // 'have.text', - // '1234ABCD' - // ); - // cy.get(':nth-child(2) > .vn-label-value > .label > span').should( - // 'have.text', - // '100' - // ); - // cy.get(':nth-child(3) > .vn-label-value > .label > span').should( - // 'have.text', - // 'Wagon Type #1' - // ); - // Delete wagon type created cy.get( '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon' From f2ae231efb4f032c58b284d84206dccadce97175 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 24 Sep 2024 09:35:34 +0200 Subject: [PATCH 3/3] fix: missing code --- .../integration/wagon/wagonCreate.spec.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/test/cypress/integration/wagon/wagonCreate.spec.js b/test/cypress/integration/wagon/wagonCreate.spec.js index 881e51f4208..cd248d1bbae 100644 --- a/test/cypress/integration/wagon/wagonCreate.spec.js +++ b/test/cypress/integration/wagon/wagonCreate.spec.js @@ -18,6 +18,22 @@ describe('WagonCreate', () => { // Save cy.get('button[type="submit"]').click(); + // Check data has been saved successfully + cy.waitForElement('.q-card'); + + cy.get( + '[to="/null/1"] > .q-card > .no-padding > .q-py-none > .cursor-text' + ).should('have.text', '1234'); + cy.get( + '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(1) > .vn-label-value > .value > :nth-child(1) > .row > span' + ).should('have.text', '1234ABCD'); + cy.get( + '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(2) > .vn-label-value > .value > :nth-child(1) > .row > span' + ).should('have.text', '100'); + cy.get( + '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(3) > .vn-label-value > .value > :nth-child(1) > .row > span' + ).should('have.text', 'Wagon Type #1'); + // Delete wagon type created cy.get( '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'