diff --git a/console/src/app/services/toast.service.ts b/console/src/app/services/toast.service.ts index cd04d70938..f6aef33185 100644 --- a/console/src/app/services/toast.service.ts +++ b/console/src/app/services/toast.service.ts @@ -62,7 +62,7 @@ export class ToastService { message, }, duration: success ? 4000 : 5000, - panelClass: success ? 'data-e2e-success' : 'data-e2e-failure', + panelClass: ['data-e2e-message', success ? 'data-e2e-success' : 'data-e2e-failure'], horizontalPosition: this.horizontalPosition, verticalPosition: this.verticalPosition, }); diff --git a/e2e/cypress/e2e/applications/applications.cy.ts b/e2e/cypress/e2e/applications/applications.cy.ts index 049c459958..606eac8fe4 100644 --- a/e2e/cypress/e2e/applications/applications.cy.ts +++ b/e2e/cypress/e2e/applications/applications.cy.ts @@ -31,12 +31,11 @@ describe('applications', () => { cy.get('[data-e2e="continue-button-redirecturis"]').click(); cy.get('[data-e2e="create-button"]').click(); cy.get('[id*=overlay]').should('exist'); - cy.get('.data-e2e-success'); + cy.shouldConfirmSuccess(); const expectClientId = new RegExp(`^.*[0-9]+\\@${testProjectName}.*$`); cy.get('[data-e2e="client-id-copy"]').click(); cy.contains('[data-e2e="client-id"]', expectClientId); cy.clipboardMatches(expectClientId); - cy.shouldNotExist({ selector: '.data-e2e-failure' }); }); }); diff --git a/e2e/cypress/e2e/humans/humans.cy.ts b/e2e/cypress/e2e/humans/humans.cy.ts index 19abe258c5..b7efd038fc 100644 --- a/e2e/cypress/e2e/humans/humans.cy.ts +++ b/e2e/cypress/e2e/humans/humans.cy.ts @@ -32,14 +32,13 @@ describe('humans', () => { cy.get('[formcontrolname="lastName"]').type('e2ehumanlastname'); cy.get('[formcontrolname="phone"]').type('+41 123456789'); cy.get('[data-e2e="create-button"]').click(); - cy.get('.data-e2e-success'); + cy.shouldConfirmSuccess(); let loginName = user.addName; if (user.mustBeDomain) { loginName = loginname(user.addName, Cypress.env('ORGANIZATION')); } cy.contains('[data-e2e="copy-loginname"]', loginName).click(); cy.clipboardMatches(loginName); - cy.shouldNotExist({ selector: '.data-e2e-failure' }); }); }); @@ -58,9 +57,11 @@ describe('humans', () => { cy.get(rowSelector).find('[data-e2e="enabled-delete-button"]').click({ force: true }); cy.get('[data-e2e="confirm-dialog-input"]').focus().type(loginName); cy.get('[data-e2e="confirm-dialog-button"]').click(); - cy.get('.data-e2e-success'); - cy.shouldNotExist({ selector: rowSelector, timeout: 2000 }); - cy.shouldNotExist({ selector: '.data-e2e-failure' }); + cy.shouldConfirmSuccess(); + cy.shouldNotExist({ + selector: rowSelector, + timeout: { ms: 2000, errMessage: 'timed out before human disappeared from the table' }, + }); }); }); }); diff --git a/e2e/cypress/e2e/machines/machines.cy.ts b/e2e/cypress/e2e/machines/machines.cy.ts index 327e1c2215..8f85570d2b 100644 --- a/e2e/cypress/e2e/machines/machines.cy.ts +++ b/e2e/cypress/e2e/machines/machines.cy.ts @@ -30,14 +30,13 @@ describe('machines', () => { cy.get('[formcontrolname="name"]').type('e2emachinename'); cy.get('[formcontrolname="description"]').type('e2emachinedescription'); cy.get('[data-e2e="create-button"]').click(); - cy.get('.data-e2e-success'); + cy.shouldConfirmSuccess(); let loginName = machine.addName; if (machine.mustBeDomain) { loginName = loginname(machine.addName, Cypress.env('ORGANIZATION')); } cy.contains('[data-e2e="copy-loginname"]', loginName).click(); cy.clipboardMatches(loginName); - cy.shouldNotExist({ selector: '.data-e2e-failure' }); }); }); @@ -56,9 +55,11 @@ describe('machines', () => { cy.get(rowSelector).find('[data-e2e="enabled-delete-button"]').click({ force: true }); cy.get('[data-e2e="confirm-dialog-input"]').focus().type(loginName); cy.get('[data-e2e="confirm-dialog-button"]').click(); - cy.get('.data-e2e-success'); - cy.shouldNotExist({ selector: rowSelector, timeout: 2000 }); - cy.shouldNotExist({ selector: '.data-e2e-failure' }); + cy.shouldConfirmSuccess(); + cy.shouldNotExist({ + selector: rowSelector, + timeout: { ms: 2000, errMessage: 'timed out before machine disappeared from the table' }, + }); }); it('should create a personal access token'); diff --git a/e2e/cypress/e2e/organization/organizations.cy.ts b/e2e/cypress/e2e/organization/organizations.cy.ts index 152da56659..1fbcb09869 100644 --- a/e2e/cypress/e2e/organization/organizations.cy.ts +++ b/e2e/cypress/e2e/organization/organizations.cy.ts @@ -27,8 +27,7 @@ describe('organizations', () => { cy.get('[data-e2e="name"]').focus().clear().type(testOrgNameChange); cy.get('[data-e2e="dialog-submit"]').click(); - cy.get('.data-e2e-success'); - cy.shouldNotExist({ selector: '.data-e2e-failure' }); + cy.shouldConfirmSuccess(); cy.visit(orgPath); cy.get('[data-e2e="top-view-title"').should('contain', testOrgNameChange); }); diff --git a/e2e/cypress/e2e/permissions/permissions.cy.ts b/e2e/cypress/e2e/permissions/permissions.cy.ts index 1ce578b8e9..ef495af648 100644 --- a/e2e/cypress/e2e/permissions/permissions.cy.ts +++ b/e2e/cypress/e2e/permissions/permissions.cy.ts @@ -39,9 +39,8 @@ describe('permissions', () => { cy.get('[data-e2e="user-option"]').click(); cy.contains('[data-e2e="role-checkbox"]', roles[0]).click(); cy.get('[data-e2e="confirm-add-member-button"]').click(); - cy.get('.data-e2e-success'); + cy.shouldConfirmSuccess(); cy.contains('[data-e2e="member-avatar"]', 'ee'); - cy.shouldNotExist({ selector: '.data-e2e-failure' }); }); }); @@ -59,9 +58,11 @@ describe('permissions', () => { it('should remove a manager', () => { cy.get('@managerRow').find('[data-e2e="remove-member-button"]').click({ force: true }); cy.get('[data-e2e="confirm-dialog-button"]').click(); - cy.get('.data-e2e-success'); - cy.shouldNotExist({ selector: rowSelector, timeout: 2000 }); - cy.shouldNotExist({ selector: '.data-e2e-failure' }); + cy.shouldConfirmSuccess(); + cy.shouldNotExist({ + selector: rowSelector, + timeout: { ms: 2000, errMessage: 'timed out before manager disappeared from the table' }, + }); }); it('should remove a managers authorization', () => { @@ -71,11 +72,10 @@ describe('permissions', () => { .find('[data-e2e="remove-role-button"]') .click({ force: true }); // TODO: Is this a bug? cy.get('[data-e2e="confirm-dialog-button"]').click(); - cy.get('.data-e2e-success'); + cy.shouldConfirmSuccess(); cy.get('@managerRow') .find('[data-e2e="remove-role-button"]') .should('have.length', roles.length - 1); - cy.shouldNotExist({ selector: '.data-e2e-failure' }); }); }); } @@ -156,9 +156,8 @@ describe('permissions', () => { cy.get('[formcontrolname="displayName"]').type('e2eroleundertestdisplay'); cy.get('[formcontrolname="group"]').type('e2eroleundertestgroup'); cy.get('[data-e2e="save-button"]').click(); - cy.get('.data-e2e-success'); + cy.shouldConfirmSuccess(); cy.contains('tr', testRoleName); - cy.shouldNotExist({ selector: '.data-e2e-failure' }); }); it('should remove a role'); }); diff --git a/e2e/cypress/e2e/projects/projects.cy.ts b/e2e/cypress/e2e/projects/projects.cy.ts index 1947383a1f..0ff46f31c6 100644 --- a/e2e/cypress/e2e/projects/projects.cy.ts +++ b/e2e/cypress/e2e/projects/projects.cy.ts @@ -19,8 +19,7 @@ describe('projects', () => { cy.get('.add-project-button').click({ force: true }); cy.get('input').type(testProjectNameCreate); cy.get('[data-e2e="continue-button"]').click(); - cy.get('.data-e2e-success'); - cy.shouldNotExist({ selector: '.data-e2e-failure' }); + cy.shouldConfirmSuccess(); }); it('should configure a project to assert roles on authentication'); @@ -40,9 +39,11 @@ describe('projects', () => { cy.get(rowSelector).find('[data-e2e="delete-project-button"]').click({ force: true }); cy.get('[data-e2e="confirm-dialog-input"]').focus().type(testProjectNameDelete); cy.get('[data-e2e="confirm-dialog-button"]').click(); - cy.get('.data-e2e-success'); - cy.shouldNotExist({ selector: rowSelector, timeout: 2000 }); - cy.shouldNotExist({ selector: '.data-e2e-failure' }); + cy.shouldConfirmSuccess(); + cy.shouldNotExist({ + selector: rowSelector, + timeout: { ms: 2000, errMessage: 'timed out before project disappeared from the table' }, + }); }); it('removes the project from grid view', () => { @@ -50,9 +51,11 @@ describe('projects', () => { cy.get(cardSelector).find('[data-e2e="delete-project-button"]').click({ force: true }); cy.get('[data-e2e="confirm-dialog-input"]').focus().type(testProjectNameDelete); cy.get('[data-e2e="confirm-dialog-button"]').click(); - cy.get('.data-e2e-success'); - cy.shouldNotExist({ selector: cardSelector, timeout: 2000 }); - cy.shouldNotExist({ selector: '.data-e2e-failure' }); + cy.shouldConfirmSuccess(); + cy.shouldNotExist({ + selector: cardSelector, + timeout: { ms: 2000, errMessage: 'timed out before project disappeared from the grid' }, + }); }); }); diff --git a/e2e/cypress/e2e/settings/oidc-settings.cy.ts b/e2e/cypress/e2e/settings/oidc-settings.cy.ts index b5e22f875f..8997c1e7d8 100644 --- a/e2e/cypress/e2e/settings/oidc-settings.cy.ts +++ b/e2e/cypress/e2e/settings/oidc-settings.cy.ts @@ -33,6 +33,6 @@ describe('oidc settings', () => { .clear() .type('7'); cy.get('[data-e2e="save-button"]').click(); - cy.get('.data-e2e-success'); + cy.shouldConfirmSuccess(); }); }); diff --git a/e2e/cypress/support/commands.ts b/e2e/cypress/support/commands.ts index 5807792d75..fc8304a196 100644 --- a/e2e/cypress/support/commands.ts +++ b/e2e/cypress/support/commands.ts @@ -26,8 +26,11 @@ import 'cypress-wait-until'; // interface ShouldNotExistOptions { - selector?: string; - timeout?: number; + selector: string; + timeout?: { + errMessage: string; + ms: number; + }; } declare global { @@ -43,7 +46,11 @@ declare global { /** * Custom command that waits until the selector finds zero elements. */ - shouldNotExist(options?: ShouldNotExistOptions): Cypress.Chainable; + shouldNotExist(options: ShouldNotExistOptions): Cypress.Chainable; + /** + * Custom command that asserts success is printed after a change. + */ + shouldConfirmSuccess(): Cypress.Chainable; } } } @@ -70,11 +77,32 @@ Cypress.Commands.add('clipboardMatches', { prevSubject: false }, (pattern: RegEx */ }); -Cypress.Commands.add('shouldNotExist', { prevSubject: false }, (options?: ShouldNotExistOptions) => { - return cy.waitUntil( - () => { - return Cypress.$(options?.selector).length === 0; - }, - { timeout: typeof options?.timeout === 'number' ? options.timeout : 500 }, - ); +Cypress.Commands.add('shouldNotExist', { prevSubject: false }, (options: ShouldNotExistOptions) => { + if (!options.timeout) { + const elements = Cypress.$(options.selector); + expect(elements.text()).to.be.empty; + expect(elements.length).to.equal(0); + return null; + } + return cy + .waitUntil( + () => { + const elements = Cypress.$(options.selector); + if (!elements.length) { + return cy.wrap(true); + } + return cy.log(`elements with selector ${options.selector} and text ${elements.text()} exist`).wrap(false); + }, + { + timeout: options.timeout.ms, + errorMsg: options.timeout.errMessage, + }, + ) + .then(() => null); +}); + +Cypress.Commands.add('shouldConfirmSuccess', { prevSubject: false }, () => { + cy.get('.data-e2e-message'); + cy.shouldNotExist({ selector: '.data-e2e-failure' }); + cy.get('.data-e2e-success'); }); diff --git a/e2e/cypress/support/login/users.ts b/e2e/cypress/support/login/users.ts index 9bb6f9dff5..f02e350ae0 100644 --- a/e2e/cypress/support/login/users.ts +++ b/e2e/cypress/support/login/users.ts @@ -1,5 +1,3 @@ -import { debug } from 'console'; - export enum User { OrgOwner = 'org_owner', OrgOwnerViewer = 'org_owner_viewer', diff --git a/e2e/package-lock.json b/e2e/package-lock.json index a189901a39..ca4708e71d 100644 --- a/e2e/package-lock.json +++ b/e2e/package-lock.json @@ -9,8 +9,6 @@ "version": "0.0.0", "dependencies": { "cypress-wait-until": "^1.7.2", - "debug": "^4.3.4", - "jsonwebtoken": "^8.5.1", "mochawesome": "^7.1.3", "prettier": "^2.7.1", "typescript": "^4.8.4", @@ -438,11 +436,6 @@ "node": "*" } }, - "node_modules/buffer-equal-constant-time": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", - "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==" - }, "node_modules/cachedir": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz", @@ -826,14 +819,6 @@ "safer-buffer": "^2.1.0" } }, - "node_modules/ecdsa-sig-formatter": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", - "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", - "dependencies": { - "safe-buffer": "^5.0.1" - } - }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -1498,35 +1483,6 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/jsonwebtoken": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", - "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", - "dependencies": { - "jws": "^3.2.2", - "lodash.includes": "^4.3.0", - "lodash.isboolean": "^3.0.3", - "lodash.isinteger": "^4.0.4", - "lodash.isnumber": "^3.0.3", - "lodash.isplainobject": "^4.0.6", - "lodash.isstring": "^4.0.1", - "lodash.once": "^4.0.0", - "ms": "^2.1.1", - "semver": "^5.6.0" - }, - "engines": { - "node": ">=4", - "npm": ">=1.4.28" - } - }, - "node_modules/jsonwebtoken/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "bin": { - "semver": "bin/semver" - } - }, "node_modules/jsprim": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz", @@ -1542,25 +1498,6 @@ "verror": "1.10.0" } }, - "node_modules/jwa": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", - "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", - "dependencies": { - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.11", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/jws": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", - "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", - "dependencies": { - "jwa": "^1.4.1", - "safe-buffer": "^5.0.1" - } - }, "node_modules/lazy-ass": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz", @@ -1617,16 +1554,6 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, - "node_modules/lodash.includes": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", - "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==" - }, - "node_modules/lodash.isboolean": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", - "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==" - }, "node_modules/lodash.isempty": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz", @@ -1637,26 +1564,11 @@ "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz", "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==" }, - "node_modules/lodash.isinteger": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", - "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==" - }, - "node_modules/lodash.isnumber": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", - "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==" - }, "node_modules/lodash.isobject": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz", "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==" }, - "node_modules/lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==" - }, "node_modules/lodash.isstring": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", @@ -1665,7 +1577,8 @@ "node_modules/lodash.once": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", - "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==" + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==", + "dev": true }, "node_modules/log-symbols": { "version": "4.1.0", @@ -2337,9 +2250,9 @@ "dev": true }, "node_modules/semver": { - "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -3105,11 +3018,6 @@ "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", "dev": true }, - "buffer-equal-constant-time": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", - "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==" - }, "cachedir": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz", @@ -3400,14 +3308,6 @@ "safer-buffer": "^2.1.0" } }, - "ecdsa-sig-formatter": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", - "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", - "requires": { - "safe-buffer": "^5.0.1" - } - }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -3891,30 +3791,6 @@ "universalify": "^2.0.0" } }, - "jsonwebtoken": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", - "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", - "requires": { - "jws": "^3.2.2", - "lodash.includes": "^4.3.0", - "lodash.isboolean": "^3.0.3", - "lodash.isinteger": "^4.0.4", - "lodash.isnumber": "^3.0.3", - "lodash.isplainobject": "^4.0.6", - "lodash.isstring": "^4.0.1", - "lodash.once": "^4.0.0", - "ms": "^2.1.1", - "semver": "^5.6.0" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - } - } - }, "jsprim": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz", @@ -3927,25 +3803,6 @@ "verror": "1.10.0" } }, - "jwa": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", - "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", - "requires": { - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.11", - "safe-buffer": "^5.0.1" - } - }, - "jws": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", - "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", - "requires": { - "jwa": "^1.4.1", - "safe-buffer": "^5.0.1" - } - }, "lazy-ass": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz", @@ -3982,16 +3839,6 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, - "lodash.includes": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", - "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==" - }, - "lodash.isboolean": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", - "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==" - }, "lodash.isempty": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz", @@ -4002,26 +3849,11 @@ "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz", "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==" }, - "lodash.isinteger": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", - "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==" - }, - "lodash.isnumber": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", - "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==" - }, "lodash.isobject": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz", "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==" }, - "lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==" - }, "lodash.isstring": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", @@ -4030,7 +3862,8 @@ "lodash.once": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", - "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==" + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==", + "dev": true }, "log-symbols": { "version": "4.1.0", @@ -4523,9 +4356,9 @@ "dev": true }, "semver": { - "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "dev": true, "requires": { "lru-cache": "^6.0.0" diff --git a/e2e/package.json b/e2e/package.json index 61f7cdca2f..a8ef8c3bd5 100644 --- a/e2e/package.json +++ b/e2e/package.json @@ -12,8 +12,6 @@ "private": true, "dependencies": { "cypress-wait-until": "^1.7.2", - "debug": "^4.3.4", - "jsonwebtoken": "^8.5.1", "mochawesome": "^7.1.3", "prettier": "^2.7.1", "typescript": "^4.8.4", @@ -24,4 +22,4 @@ "@types/node": "^18.8.3", "cypress": "^10.9.0" } -} +} \ No newline at end of file