From 1acfbfa3cbd4cdf63f8f0929c2cbc02c8517fd29 Mon Sep 17 00:00:00 2001 From: jtubau Date: Mon, 3 Feb 2025 09:32:17 +0100 Subject: [PATCH] refactor: refs #8484 enhance login command with session management and clean up unused commands --- test/cypress/support/commands.js | 63 ++++++++++---------------------- 1 file changed, 20 insertions(+), 43 deletions(-) diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js index e1f6b3651..c783677b6 100755 --- a/test/cypress/support/commands.js +++ b/test/cypress/support/commands.js @@ -28,28 +28,31 @@ // Imports Quasar Cypress AE predefined commands // import { registerCommands } from '@quasar/quasar-app-extension-testing-e2e-cypress'; Cypress.Commands.add('waitUntil', { prevSubject: 'optional' }, require('./waitUntil')); + Cypress.Commands.add('resetDB', () => { cy.exec('pnpm run resetDatabase'); }); -Cypress.Commands.add('login', (user) => { - //cy.visit('/#/login'); - cy.request({ - method: 'POST', - url: '/api/accounts/login', - body: { - user: user, - password: 'nightmare', - }, - }).then((response) => { - window.localStorage.setItem('token', response.body.token); + +Cypress.Commands.add('login', (user = 'developer') => { + cy.session(['user-session', user], () => { cy.request({ - method: 'GET', - url: '/api/VnUsers/ShareToken', - headers: { - Authorization: window.localStorage.getItem('token'), + method: 'POST', + url: '/api/accounts/login', + body: { + user: user, + password: 'nightmare', }, - }).then(({ body }) => { - window.localStorage.setItem('tokenMultimedia', body.multimediaToken.id); + }).then((response) => { + window.localStorage.setItem('token', response.body.token); + cy.request({ + method: 'GET', + url: '/api/VnUsers/ShareToken', + headers: { + Authorization: window.localStorage.getItem('token'), + }, + }).then(({ body }) => { + window.localStorage.setItem('tokenMultimedia', body.multimediaToken.id); + }); }); }); }); @@ -311,32 +314,6 @@ Cypress.Commands.add('clickButtonsDescriptor', (id) => { .click(); }); -Cypress.Commands.add('openActionDescriptor', (opt) => { - cy.openActionsDescriptor(); - const listItem = '[role="menu"] .q-list .q-item'; - cy.contains(listItem, opt).click(); - 1; -}); - -Cypress.Commands.add('clickButtonsDescriptor', (id) => { - cy.get(`.actions > .q-card__actions> .q-btn:nth-child(${id})`) - .invoke('removeAttr', 'target') - .click(); -}); - -Cypress.Commands.add('openActionDescriptor', (opt) => { - cy.openActionsDescriptor(); - const listItem = '[role="menu"] .q-list .q-item'; - cy.contains(listItem, opt).click(); - 1; -}); - -Cypress.Commands.add('clickButtonsDescriptor', (id) => { - cy.get(`.actions > .q-card__actions> .q-btn:nth-child(${id})`) - .invoke('removeAttr', 'target') - .click(); -}); - Cypress.Commands.add('openUserPanel', () => { cy.get( '.column > .q-avatar > .q-avatar__content > .q-img > .q-img__container > .q-img__image',