diff --git a/badges/coverage-badge.svg b/badges/coverage-badge.svg index 8df4ec3e..a8315467 100644 --- a/badges/coverage-badge.svg +++ b/badges/coverage-badge.svg @@ -1 +1 @@ -Statements 43.31%Statements 43.31%Branches 32.3%Branches 32.3%Lines 44.45%Lines 44.45%Functions 48.9%Functions 48.9% +Statements 46.46%Statements 46.46%Branches 35.01%Branches 35.01%Lines 47.67%Lines 47.67%Functions 50.79%Functions 50.79% diff --git a/badges/tests-badge.svg b/badges/tests-badge.svg index ef7370d8..0d1ca370 100644 --- a/badges/tests-badge.svg +++ b/badges/tests-badge.svg @@ -1 +1 @@ -TestsTests129/132129/132 \ No newline at end of file +TestsTests132/132132/132 \ No newline at end of file diff --git a/cypress/integration/ui/control-points.js b/cypress/integration/ui/control-points.js index bfaa5585..593f2f26 100644 --- a/cypress/integration/ui/control-points.js +++ b/cypress/integration/ui/control-points.js @@ -22,10 +22,10 @@ describe('UI - Control Points', function () { cy.get('#tool_source_save').click(); cy.get('#svg_1').click().click(); - cy.get('#pathpointgrip_0').trigger('mousedown', {which: 1}) + cy.get('#pathpointgrip_0').trigger('mousedown', {which: 1, force: true}) .trigger('mousemove', randomOffset(), randomOffset(), {force: true}) .trigger('mouseup', {force: true}); - cy.get('#pathpointgrip_1').trigger('mousedown', {which: 1}) + cy.get('#pathpointgrip_1').trigger('mousedown', {which: 1, force: true}) .trigger('mousemove', randomOffset(), randomOffset(), {force: true}) .trigger('mouseup', {force: true}); diff --git a/cypress/integration/ui/export.js b/cypress/integration/ui/export.js index 23fe4fb7..48d68ba2 100644 --- a/cypress/integration/ui/export.js +++ b/cypress/integration/ui/export.js @@ -14,7 +14,7 @@ describe('UI - Export tests', function () { it('Editor - No parameters: Export button clicking; dialog opens', () => { openMainMenu(); - cy.get('#tool_export').click(); + cy.get('#tool_export').click({force: true}); cy.get('#dialog_content select'); }); }); diff --git a/cypress/integration/ui/issues/issue-359.js b/cypress/integration/ui/issues/issue-359.js index a07749ca..fed05e2f 100644 --- a/cypress/integration/ui/issues/issue-359.js +++ b/cypress/integration/ui/issues/issue-359.js @@ -11,13 +11,13 @@ describe('Fix issue 359', function () { it('can undo without throwing', function () { cy.get('#tool_source').click(); cy.get('#svg_source_textarea') - .type('{selectall}') + .type('{selectall}', {force: true}) .type(` Layer 1 - `, {parseSpecialCharSequences: false}); + `, {parseSpecialCharSequences: false, force: true}); cy.get('#tool_source_save').click(); cy.get('#tool_undo').click(); cy.get('#tool_redo').click(); // test also redo to make the test more comprehensive diff --git a/cypress/integration/ui/issues/issue-407.js b/cypress/integration/ui/issues/issue-407.js index 101727d9..a67f2f0b 100644 --- a/cypress/integration/ui/issues/issue-407.js +++ b/cypress/integration/ui/issues/issue-407.js @@ -11,7 +11,7 @@ describe('Fix issue 407', function () { it('can enter edit on text child', function () { cy.get('#tool_source').click(); cy.get('#svg_source_textarea') - .type('{selectall}') + .type('{selectall}', {force: true}) .type(` Layer 1 @@ -24,7 +24,12 @@ describe('Fix issue 407', function () { cy.get('#tool_source_save').click(); cy.get('#svg_1').click().dblclick(); cy.get('#a_text').should('exist'); - cy.get('#a_text').trigger('mousedown', {which: 1}).trigger('mouseup').dblclick().type('1234'); + cy.get('#a_text') + .trigger('mousedown', {which: 1, force: true}) + .trigger('mouseup', {force: true}) + .dblclick({force: true}); + // svgedit use the #text text field to capture the text + cy.get('#text').type('1234', {force: true}); cy.get('#a_text').should('have.text', 'he1234llo'); }); }); diff --git a/cypress/integration/ui/issues/issue-423.js b/cypress/integration/ui/issues/issue-423.js index dfb9d442..005d2311 100644 --- a/cypress/integration/ui/issues/issue-423.js +++ b/cypress/integration/ui/issues/issue-423.js @@ -11,7 +11,7 @@ describe('Fix issue 423', function () { it('should not throw when undoing the move', function () { cy.get('#tool_source').click(); cy.get('#svg_source_textarea') - .type('{selectall}') + .type('{selectall}', {force: true}) .type(` Layer 1 @@ -22,12 +22,12 @@ describe('Fix issue 423', function () { - `, {parseSpecialCharSequences: false}); - cy.get('#tool_source_save').click(); + `, {parseSpecialCharSequences: false, force: true}); + cy.get('#tool_source_save').click({force: true}); cy.get('#TANK1') .trigger('mousedown', {force: true}) .trigger('mousemove', 50, 0, {force: true}) .trigger('mouseup', {force: true}); - cy.get('#tool_undo').click(); + cy.get('#tool_undo').click({force: true}); }); }); diff --git a/package-lock.json b/package-lock.json index 47a19e1c..3c410349 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7105,9 +7105,9 @@ } }, "cypress": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-4.12.0.tgz", - "integrity": "sha512-ZDngKMwoQ2UYmeSUJikLMZG6t2N7lTHHlzBzh5W0MbPfXSMv36YUgL2ZVD+t4ZLA63WWkvhwxIkDG+WJknBgHw==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-4.12.1.tgz", + "integrity": "sha512-9SGIPEmqU8vuRA6xst2CMTYd9sCFCxKSzrHt0wr+w2iAQMCIIsXsQ5Gplns1sT6LDbZcmLv6uehabAOl3fhc9Q==", "dev": true, "requires": { "@cypress/listr-verbose-renderer": "^0.4.1", @@ -8596,13 +8596,13 @@ } }, "eslint-plugin-mocha": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-7.0.1.tgz", - "integrity": "sha512-zkQRW9UigRaayGm/pK9TD5RjccKXSgQksNtpsXbG9b6L5I+jNx7m98VUbZ4w1H1ArlNA+K7IOH+z8TscN6sOYg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-8.0.0.tgz", + "integrity": "sha512-n67etbWDz6NQM+HnTwZHyBwz/bLlYPOxUbw7bPuCyFujv7ZpaT/Vn6KTAbT02gf7nRljtYIjWcTxK/n8a57rQQ==", "dev": true, "requires": { - "eslint-utils": "^2.0.0", - "ramda": "^0.27.0" + "eslint-utils": "^2.1.0", + "ramda": "^0.27.1" }, "dependencies": { "eslint-utils": { @@ -8615,9 +8615,9 @@ } }, "ramda": { - "version": "0.27.0", - "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.0.tgz", - "integrity": "sha512-pVzZdDpWwWqEVVLshWUHjNwuVP7SfcmPraYuqocJp1yo2U1R7P+5QAfDhdItkuoGqIBnBYrtPp7rEPqDn9HlZA==", + "version": "0.27.1", + "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.1.tgz", + "integrity": "sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw==", "dev": true } } diff --git a/package.json b/package.json index c4f77d33..f4a88b37 100644 --- a/package.json +++ b/package.json @@ -177,7 +177,7 @@ "coveradge": "^0.6.0", "cp-cli": "^2.0.0", "cross-var": "^1.1.0", - "cypress": "^4.12.0", + "cypress": "^4.12.1", "cypress-axe": "^0.8.1", "cypress-multi-reporters": "^1.4.0", "deparam": "git+https://github.com/brettz9/deparam.git#updates", @@ -195,7 +195,7 @@ "eslint-plugin-import": "^2.22.0", "eslint-plugin-jsdoc": "^30.2.1", "eslint-plugin-markdown": "^1.0.2", - "eslint-plugin-mocha": "^7.0.1", + "eslint-plugin-mocha": "^8.0.0", "eslint-plugin-mocha-cleanup": "^1.8.0", "eslint-plugin-no-unsanitized": "^3.1.2", "eslint-plugin-no-use-extend-native": "^0.5.0",