fix integration tests after cypress update

badges/coverage-badge.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="414" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="orange" stroke="#000" d="M0 0h120v20H0zM120 0h102v20H120zM222 0h87v20h-87z"/><path fill="green" stroke="#000" d="M309 0h105v20H309z"/><path fill="url(#smooth)" d="M0 0h414v20H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">Statements 43.31%</text><text class="high" x="5" y="14">Statements 43.31%</text><text class="shadow" x="125.5" y="15">Branches 32.3%</text><text class="high" x="125" y="14">Branches 32.3%</text><text class="shadow" x="227.5" y="15">Lines 44.45%</text><text class="high" x="227" y="14">Lines 44.45%</text><text class="shadow" x="314.5" y="15">Functions 48.9%</text><text class="high" x="314" y="14">Functions 48.9%</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="428" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="green" stroke="#000" d="M0 0h120v20H0zM120 0h109v20H120zM229 0h87v20h-87zM316 0h112v20H316z"/><path fill="url(#smooth)" d="M0 0h428v20H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">Statements 46.46%</text><text class="high" x="5" y="14">Statements 46.46%</text><text class="shadow" x="125.5" y="15">Branches 35.01%</text><text class="high" x="125" y="14">Branches 35.01%</text><text class="shadow" x="234.5" y="15">Lines 47.67%</text><text class="high" x="234" y="14">Lines 47.67%</text><text class="shadow" x="321.5" y="15">Functions 50.79%</text><text class="high" x="321" y="14">Functions 50.79%</text></g></svg>

badges/tests-badge.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="97" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="#696969" d="M0 0h41v20H0z"/><path fill="#e05d44" d="M41 0h56v20H41z"/><path fill="url(#smooth)" d="M0 0h97v20H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">Tests</text><text class="high" x="5" y="14">Tests</text><text class="shadow" x="46.5" y="15">129/132</text><text class="high" x="46" y="14">129/132</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="97" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="#696969" d="M0 0h41v20H0z"/><path fill="#4c1" d="M41 0h56v20H41z"/><path fill="url(#smooth)" d="M0 0h97v20H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">Tests</text><text class="high" x="5" y="14">Tests</text><text class="shadow" x="46.5" y="15">132/132</text><text class="high" x="46" y="14">132/132</text></g></svg>

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});
 

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');
   });
 });

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(`<svg width="640" height="480" xmlns="http://www.w3.org/2000/svg">
       <g class="layer">
        <title>Layer 1</title>
         <rect fill="#ffff00" height="70" width="165" x="179.5" y="146.5"/>
       </g>
-     </svg>`, {parseSpecialCharSequences: false});
+     </svg>`, {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

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(`<svg width="640" height="480" xmlns="http://www.w3.org/2000/svg">
       <g class="layer">
        <title>Layer 1</title>
@@ -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');
   });
 });

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(`<svg width="300" height="300" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
       <g class="layer">
        <title>Layer 1</title>
@@ -22,12 +22,12 @@ describe('Fix issue 423', function () {
         <rect clip-path="url(#svg_2)" fill="#0033b5" height="174.9" id="TANK1" width="78" x="77.5" y="29"/>
        </g>
       </g>
-     </svg>`, {parseSpecialCharSequences: false});
+     </svg>`, {parseSpecialCharSequences: false, force: true});
-    cy.get('#tool_source_save').click();
+    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});
   });
 });

package-lock.json

@@ -7105,9 +7105,9 @@
       }
     },
     "cypress": {
-      "version": "4.12.0",
+      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-4.12.0.tgz",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-4.12.1.tgz",
-      "integrity": "sha512-ZDngKMwoQ2UYmeSUJikLMZG6t2N7lTHHlzBzh5W0MbPfXSMv36YUgL2ZVD+t4ZLA63WWkvhwxIkDG+WJknBgHw==",
+      "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",
+      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-7.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-8.0.0.tgz",
-      "integrity": "sha512-zkQRW9UigRaayGm/pK9TD5RjccKXSgQksNtpsXbG9b6L5I+jNx7m98VUbZ4w1H1ArlNA+K7IOH+z8TscN6sOYg==",
+      "integrity": "sha512-n67etbWDz6NQM+HnTwZHyBwz/bLlYPOxUbw7bPuCyFujv7ZpaT/Vn6KTAbT02gf7nRljtYIjWcTxK/n8a57rQQ==",
       "dev": true,
       "requires": {
-        "eslint-utils": "^2.0.0",
+        "eslint-utils": "^2.1.0",
-        "ramda": "^0.27.0"
+        "ramda": "^0.27.1"
       },
       "dependencies": {
         "eslint-utils": {
@@ -8615,9 +8615,9 @@
           }
         },
         "ramda": {
-          "version": "0.27.0",
+          "version": "0.27.1",
-          "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.0.tgz",
+          "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.1.tgz",
-          "integrity": "sha512-pVzZdDpWwWqEVVLshWUHjNwuVP7SfcmPraYuqocJp1yo2U1R7P+5QAfDhdItkuoGqIBnBYrtPp7rEPqDn9HlZA==",
+          "integrity": "sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw==",
           "dev": true
         }
       }

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",