diff --git a/cypress/e2e/MenuBar.spec.js b/cypress/e2e/MenuBar.spec.js index 7f7eebf8c1b..ee061da1e89 100644 --- a/cypress/e2e/MenuBar.spec.js +++ b/cypress/e2e/MenuBar.spec.js @@ -28,38 +28,33 @@ describe('Test the rich text editor menu bar', function() { } beforeEach(cy.clearContent) + it('empty file', () => { cy.getFile(fileName) - .then($el => { - cy.getActionEntry('remain') - .click() - getWordCount() - .should('include.text', '0 words, 0 chars') - }) + cy.getActionEntry('remain') + .click() + getWordCount() + .should('include.text', '0 words, 0 chars') }) it('single word', () => { cy.getFile(fileName) - .then($el => { - cy.clearContent() - .type(' Hello ') - cy.getActionEntry('remain') - .click() - getWordCount() - .should('include.text', '1 word, 9 chars') - }) + cy.getContent() + .type(' Hello ') + cy.getActionEntry('remain') + .click() + getWordCount() + .should('include.text', '1 word, 9 chars') }) it('multiple words', () => { cy.getFile(fileName) - .then($el => { - cy.clearContent() - .type('Hello \nworld') - cy.getActionEntry('remain') - .click() - getWordCount() - .should('include.text', '2 words, 11 chars') - }) + cy.getContent() + .type('Hello \nworld') + cy.getActionEntry('remain') + .click() + getWordCount() + .should('include.text', '2 words, 11 chars') }) }) }) diff --git a/cypress/e2e/nodes/FrontMatter.spec.js b/cypress/e2e/nodes/FrontMatter.spec.js index 2e857b6a23f..3dbda642c18 100644 --- a/cypress/e2e/nodes/FrontMatter.spec.js +++ b/cypress/e2e/nodes/FrontMatter.spec.js @@ -33,33 +33,32 @@ describe('Front matter support', function() { }) it('Open file with front matter', function() { - cy.openFile('frontmatter.md').then(() => { - cy.getContent().find('pre.frontmatter').should(pre => { - expect(pre.length === 1) - expect(pre[0].text === 'some: value\nother: 1.2') - }) + cy.openFile('frontmatter.md') + cy.getContent().find('pre.frontmatter').should(pre => { + expect(pre.length === 1) + expect(pre[0].text === 'some: value\nother: 1.2') }) }) it('Add front matter', function() { - cy.openFile('empty.md').clearContent().then(() => { - cy.getContent().type('---') - cy.getContent().type('test') - cy.getContent().find('pre.frontmatter').should(pre => { - expect(pre.length === 1) - expect(pre[0].text === 'test') - }) + cy.openFile('empty.md') + cy.clearContent() + cy.getContent().type('---') + cy.getContent().type('test') + cy.getContent().find('pre.frontmatter').should(pre => { + expect(pre.length === 1) + expect(pre[0].text === 'test') }) }) it('Do not add multiple front matter', function() { - cy.openFile('empty.md').clearContent().then(() => { - cy.getContent().type('---test') - cy.getContent().type('{downArrow}') - cy.getContent().type('---test') - cy.getContent().find('pre.frontmatter').should(pre => expect(pre.length === 1)) - cy.getContent().find('hr').should(hr => expect(hr.length === 1)) - }) + cy.openFile('empty.md') + cy.clearContent() + cy.getContent().type('---test') + cy.getContent().type('{downArrow}') + cy.getContent().type('---test') + cy.getContent().find('pre.frontmatter').should(pre => expect(pre.length === 1)) + cy.getContent().find('hr').should(hr => expect(hr.length === 1)) }) it('Reopen front matter', function() { diff --git a/cypress/e2e/nodes/Links.spec.js b/cypress/e2e/nodes/Links.spec.js index 135fbfc2bbe..481b55867b4 100644 --- a/cypress/e2e/nodes/Links.spec.js +++ b/cypress/e2e/nodes/Links.spec.js @@ -49,6 +49,7 @@ describe('test link marks', function() { const link = `${Cypress.env('baseUrl')}/apps/files/file-name?fileId=${id}` cy.clearContent() + cy.getContent() .type(`${link}{enter}`) cy.getContent() @@ -68,6 +69,7 @@ describe('test link marks', function() { const link = `${Cypress.env('baseUrl')}/file-name?fileId=${id}` cy.clearContent() + cy.getContent() .type(`${link}{enter}`) cy.getContent() @@ -82,6 +84,7 @@ describe('test link marks', function() { it('without protocol', () => { cy.clearContent() + cy.getContent() .type('google.com{enter}') cy.getContent() .find('a[href*="google.com"]') @@ -118,7 +121,6 @@ describe('test link marks', function() { .should('have.been.calledWith', url) } - beforeEach(cy.clearContent) it('Link website without selection', () => { cy.getFile(fileName) .then($el => { @@ -148,8 +150,6 @@ describe('test link marks', function() { .click({ force: true }) } - beforeEach(() => cy.clearContent()) - it('without text', () => { cy.getFile(fileName) .then($el => { diff --git a/cypress/support/commands.js b/cypress/support/commands.js index e55f540df3f..f8020f8f6bf 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -375,7 +375,6 @@ Cypress.Commands.add('getTOC', () => { Cypress.Commands.add('clearContent', () => { cy.getContent().scrollIntoView() cy.getContent().type('{selectAll}{backspace}') - return cy.getContent() }) Cypress.Commands.add('openWorkspace', () => { diff --git a/package-lock.json b/package-lock.json index b1a7eefb174..74a2ce1ff3e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -97,7 +97,7 @@ "@vue/test-utils": "^1.3.0 <2", "@vue/vue2-jest": "^29.2.5", "cypress": "^12.17.4", - "eslint-plugin-cypress": "^2.13.3", + "eslint-plugin-cypress": "^2.14.0", "identity-obj-proxy": "^3.0.0", "jest": "^29.6.2", "jest-environment-jsdom": "^29.6.2", @@ -9846,17 +9846,44 @@ } }, "node_modules/eslint-plugin-cypress": { - "version": "2.13.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.13.3.tgz", - "integrity": "sha512-nAPjZE5WopCsgJwl3vHm5iafpV+ZRO76Z9hMyRygWhmg5ODXDPd+9MaPl7kdJ2azj+sO87H3P1PRnggIrz848g==", + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.14.0.tgz", + "integrity": "sha512-eW6tv7iIg7xujleAJX4Ujm649Bf5jweqa4ObPEIuueYRyLZt7qXGWhCY/n4bfeFW/j6nQZwbIBHKZt6EKcL/cg==", "dev": true, "dependencies": { - "globals": "^11.12.0" + "globals": "^13.20.0" }, "peerDependencies": { "eslint": ">= 3.2.1" } }, + "node_modules/eslint-plugin-cypress/node_modules/globals": { + "version": "13.21.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz", + "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint-plugin-cypress/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/eslint-plugin-es-x": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.1.0.tgz", @@ -29970,12 +29997,29 @@ } }, "eslint-plugin-cypress": { - "version": "2.13.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.13.3.tgz", - "integrity": "sha512-nAPjZE5WopCsgJwl3vHm5iafpV+ZRO76Z9hMyRygWhmg5ODXDPd+9MaPl7kdJ2azj+sO87H3P1PRnggIrz848g==", + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.14.0.tgz", + "integrity": "sha512-eW6tv7iIg7xujleAJX4Ujm649Bf5jweqa4ObPEIuueYRyLZt7qXGWhCY/n4bfeFW/j6nQZwbIBHKZt6EKcL/cg==", "dev": true, "requires": { - "globals": "^11.12.0" + "globals": "^13.20.0" + }, + "dependencies": { + "globals": { + "version": "13.21.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz", + "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==", + "dev": true, + "requires": { + "type-fest": "^0.20.2" + } + }, + "type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true + } } }, "eslint-plugin-es-x": { diff --git a/package.json b/package.json index 50198ef091f..ab9e4d3febd 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "@vue/test-utils": "^1.3.0 <2", "@vue/vue2-jest": "^29.2.5", "cypress": "^12.17.4", - "eslint-plugin-cypress": "^2.13.3", + "eslint-plugin-cypress": "^2.14.0", "identity-obj-proxy": "^3.0.0", "jest": "^29.6.2", "jest-environment-jsdom": "^29.6.2",