diff --git a/cypress/integration/intro.spec.ts b/cypress/integration/intro.spec.ts index 63f970fa8..ce241c7c9 100644 --- a/cypress/integration/intro.spec.ts +++ b/cypress/integration/intro.spec.ts @@ -38,28 +38,17 @@ describe('Intro', () => { }) }) - describe('Version', () => { - it('can be opened', () => { - cy.get('#versionModal') - .should('not.be.visible') - cy.get('#version') - .click() - cy.get('#versionModal') - .should('be.visible') - }) - - it('can be closed', () => { - cy.get('#versionModal') - .should('not.be.visible') - cy.get('#version') - .click() - cy.get('#versionModal') - .should('be.visible') - cy.get('#versionModal .modal-footer .btn') - .contains('Close') - .click() - cy.get('#versionModal') - .should('not.be.visible') - }) + it('Versioncan be opened and closed', () => { + cy.get('#versionModal') + .should('not.exist') + cy.get('#version') + .click() + cy.get('#versionModal') + .should('be.visible') + cy.get('#versionModal .modal-footer .btn') + .contains('Close') + .click() + cy.get('#versionModal') + .should('not.exist') }) }) diff --git a/cypress/integration/profile.spec.ts b/cypress/integration/profile.spec.ts index 372ce545f..dd9d7ee8d 100644 --- a/cypress/integration/profile.spec.ts +++ b/cypress/integration/profile.spec.ts @@ -40,6 +40,8 @@ describe('profile page', () => { }) it('delete token', () => { + cy.get('.modal-dialog') + .should('not.exist') cy.get('.card.access-tokens .list-group-item .btn-danger') .click() cy.get('.modal-dialog') @@ -47,7 +49,7 @@ describe('profile page', () => { .get('.modal-footer .btn-danger') .click() cy.get('.modal-dialog') - .should('not.be.visible') + .should('not.exist') }) it('add token', () => { @@ -55,6 +57,8 @@ describe('profile page', () => { .should('be.disabled') cy.get('.card.access-tokens input[type=text]') .type('cypress') + cy.get('.modal-dialog') + .should('not.exist') cy.get('.card.access-tokens .btn-primary') .should('not.be.disabled') .click() diff --git a/package.json b/package.json index d68a820d0..d054660d6 100644 --- a/package.json +++ b/package.json @@ -163,7 +163,7 @@ "@types/redux-devtools": "3.0.47", "@types/redux-devtools-extension": "2.13.2", "cross-env": "7.0.2", - "cypress": "5.6.0", + "cypress": "6.0.0", "cypress-commands": "1.1.0", "cypress-file-upload": "4.1.1", "eslint-plugin-chai-friendly": "0.6.0", @@ -175,6 +175,6 @@ "webpack-bundle-analyzer": "4.1.0" }, "resolutions": { - "cypress": "5.6.0" + "cypress": "6.0.0" } } diff --git a/yarn.lock b/yarn.lock index a47896987..643a418cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4892,10 +4892,10 @@ cypress-file-upload@4.1.1: dependencies: mime "^2.4.4" -cypress@5.6.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-5.6.0.tgz#6781755c3ddfd644ce3179fcd7389176c0c82280" - integrity sha512-cs5vG3E2JLldAc16+5yQxaVRLLqMVya5RlrfPWkC72S5xrlHFdw7ovxPb61s4wYweROKTyH01WQc2PFzwwVvyQ== +cypress@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-6.0.0.tgz#57050773c61e8fe1e5c9871cc034c616fcacded9" + integrity sha512-A/w9S15xGxX5UVeAQZacKBqaA0Uqlae9e5WMrehehAdFiLOZj08IgSVZOV8YqA9OH9Z0iBOnmsEkK3NNj43VrA== dependencies: "@cypress/listr-verbose-renderer" "^0.4.1" "@cypress/request" "^2.88.5"