From d7028c6e30166ae0e1907214b44b8b4078dd1aab Mon Sep 17 00:00:00 2001 From: danloa Date: Fri, 18 Oct 2024 15:47:31 -0400 Subject: [PATCH 1/9] Just for testing --- tests/e2e/support/utils.js | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/e2e/support/utils.js b/tests/e2e/support/utils.js index cdbf5fb6e..56d681b6e 100644 --- a/tests/e2e/support/utils.js +++ b/tests/e2e/support/utils.js @@ -465,6 +465,7 @@ export function selectComponentType(component, type) { export function clickAndDropElement(node, position) { cy.window().its('store.state.paper').then(paper => { + const { tx, ty } = paper.translate(); cy.get('.main-paper').then($paperContainer => { From 5670c8ca3366b612134dec35e43bfac59a916ff9 Mon Sep 17 00:00:00 2001 From: danloa Date: Mon, 21 Oct 2024 11:53:53 -0400 Subject: [PATCH 2/9] Update VFE --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8390ebe1b..27ec63c40 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@fortawesome/free-solid-svg-icons": "^5.11.2", "@fortawesome/vue-fontawesome": "^0.1.8", "@processmaker/screen-builder": "2.99.3", - "@processmaker/vue-form-elements": "0.60.0", + "@processmaker/vue-form-elements": "0.60.1", "@processmaker/vue-multiselect": "2.3.0", "bootstrap": "^4.3.1", "bootstrap-vue": "^2.0.4", From ee05634a5bd39bfaa3b36c417676adaa6f51f44f Mon Sep 17 00:00:00 2001 From: danloa Date: Mon, 21 Oct 2024 15:10:51 -0400 Subject: [PATCH 3/9] lock file --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 113b66231..c79fe10ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@fortawesome/free-solid-svg-icons": "^5.11.2", "@fortawesome/vue-fontawesome": "^0.1.8", "@processmaker/screen-builder": "2.99.3", - "@processmaker/vue-form-elements": "0.60.0", + "@processmaker/vue-form-elements": "0.60.1", "@processmaker/vue-multiselect": "2.3.0", "bootstrap": "^4.3.1", "bootstrap-vue": "^2.0.4", @@ -4757,9 +4757,9 @@ "integrity": "sha512-JAc0mtW7NeO+0SwPRcdkfDbWLgkqL9WfP1NbpP9wNASsW6oWqgZqNIWt4teymGjZIXTElx3dnQmUYHmVrJ7HxA==" }, "node_modules/@processmaker/vue-form-elements": { - "version": "0.60.0", - "resolved": "https://registry.npmjs.org/@processmaker/vue-form-elements/-/vue-form-elements-0.60.0.tgz", - "integrity": "sha512-Rndk+TlCl3SXGx7VeZq0207fzA3ALNEjfapXazra1yI+AQFqPYAdSLrisckSvGYPTG0TFGGBhpzh+cHjOWlwug==", + "version": "0.60.1", + "resolved": "https://registry.npmjs.org/@processmaker/vue-form-elements/-/vue-form-elements-0.60.1.tgz", + "integrity": "sha512-cFmhrqMz0n3aOS556wJpb5Jm0dasvqLNIaHAuT1T4uhboo+JI6Lxfp57JbJuQ8NS7c2FcTm0MgoPAxtiWTt6Ng==", "dependencies": { "@chantouchsek/validatorjs": "1.2.3", "@tinymce/tinymce-vue": "2.0.0", From 9b74bb9a018f444ad45967484f9a9ceca5c9fcf2 Mon Sep 17 00:00:00 2001 From: danloa Date: Tue, 22 Oct 2024 14:12:36 -0400 Subject: [PATCH 4/9] Bump SB version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 27ec63c40..700319171 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@fortawesome/free-brands-svg-icons": "^6.4.2", "@fortawesome/free-solid-svg-icons": "^5.11.2", "@fortawesome/vue-fontawesome": "^0.1.8", - "@processmaker/screen-builder": "2.99.3", + "@processmaker/screen-builder": "2.99.4", "@processmaker/vue-form-elements": "0.60.1", "@processmaker/vue-multiselect": "2.3.0", "bootstrap": "^4.3.1", From 17504de85b0eb2de5622cc8a1531787f718d4139 Mon Sep 17 00:00:00 2001 From: danloa Date: Tue, 22 Oct 2024 14:19:57 -0400 Subject: [PATCH 5/9] Lock file --- package-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index c79fe10ae..b61ca8978 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@fortawesome/free-brands-svg-icons": "^6.4.2", "@fortawesome/free-solid-svg-icons": "^5.11.2", "@fortawesome/vue-fontawesome": "^0.1.8", - "@processmaker/screen-builder": "2.99.3", + "@processmaker/screen-builder": "2.99.4", "@processmaker/vue-form-elements": "0.60.1", "@processmaker/vue-multiselect": "2.3.0", "bootstrap": "^4.3.1", @@ -4668,9 +4668,9 @@ } }, "node_modules/@processmaker/screen-builder": { - "version": "2.99.3", - "resolved": "https://registry.npmjs.org/@processmaker/screen-builder/-/screen-builder-2.99.3.tgz", - "integrity": "sha512-al0t8tWUe0X6Rg3XRnZ4XXCzWXBF7UEIKYHwcoBNVYBbxuluFWw6uZ+72EZfj5N11Np8oxgZ9zoCVkmU0hB/Zg==", + "version": "2.99.4", + "resolved": "https://registry.npmjs.org/@processmaker/screen-builder/-/screen-builder-2.99.4.tgz", + "integrity": "sha512-kMiTXe2FoyhTtB+XxNMeVOWCrq3j+tnSMLMtJJCsgrXjjG27v/CvX1HtIqoJdR6j92qpa7UBs9iBewSmGby7fQ==", "dependencies": { "@chantouchsek/validatorjs": "1.2.3", "@storybook/addon-docs": "^7.6.13", @@ -4693,7 +4693,7 @@ }, "peerDependencies": { "@panter/vue-i18next": "^0.15.0", - "@processmaker/vue-form-elements": "0.60.0", + "@processmaker/vue-form-elements": "0.60.1", "i18next": "^15.0.8", "vue": "^2.6.12", "vuex": "^3.1.1" From 121b41b78471d08484e071f30190e5542eb882be Mon Sep 17 00:00:00 2001 From: danloa Date: Tue, 22 Oct 2024 16:37:41 -0400 Subject: [PATCH 6/9] Test runn all tests in one job --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5af107f3b..35380de1c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: strategy: fail-fast: false # https://github.com/cypress-io/github-action/issues/48 matrix: - containers: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10] + containers: [ 0 ] steps: - name: Checkout 🛎 From c4c07fd71d056d96468cd8f0b07df80321b1cd2e Mon Sep 17 00:00:00 2001 From: danloa Date: Tue, 22 Oct 2024 17:06:49 -0400 Subject: [PATCH 7/9] Add wait --- .github/workflows/ci.yml | 2 +- tests/e2e/specs/SequenceFlows.cy.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35380de1c..5af107f3b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: strategy: fail-fast: false # https://github.com/cypress-io/github-action/issues/48 matrix: - containers: [ 0 ] + containers: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10] steps: - name: Checkout 🛎 diff --git a/tests/e2e/specs/SequenceFlows.cy.js b/tests/e2e/specs/SequenceFlows.cy.js index 4c573897d..6141d621b 100644 --- a/tests/e2e/specs/SequenceFlows.cy.js +++ b/tests/e2e/specs/SequenceFlows.cy.js @@ -145,6 +145,7 @@ describe('Sequence Flows', { scrollBehavior: false }, () => { }); it('Retains target anchor point after parsing and moving shape', () => { + cy.wait(3000); const startEventPosition = { x: 210, y: 200 }; const taskPosition = { x: 350, y: 300 }; clickAndDropElement(nodeTypes.task, taskPosition); From 2932d3b25c02ba29c2d1d3d5d786a202234d6130 Mon Sep 17 00:00:00 2001 From: danloa Date: Tue, 22 Oct 2024 17:18:29 -0400 Subject: [PATCH 8/9] Increase time --- tests/e2e/support/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/support/utils.js b/tests/e2e/support/utils.js index 56d681b6e..7bbf43e92 100644 --- a/tests/e2e/support/utils.js +++ b/tests/e2e/support/utils.js @@ -2,7 +2,7 @@ import { saveDebounce } from '../../../src/components/inspectors/inspectorConsta import path from 'path'; import { boundaryEventSelector, nodeTypes, taskSelector } from './constants'; -const renderTime = 300; +const renderTime = 500; export function getTinyMceEditor() { return cy From 3b03362bfe0c6bea8b310f022ec13bba2b92e56c Mon Sep 17 00:00:00 2001 From: danloa Date: Tue, 22 Oct 2024 17:25:10 -0400 Subject: [PATCH 9/9] Increase render time --- tests/e2e/support/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/support/utils.js b/tests/e2e/support/utils.js index 7bbf43e92..f32fea6fc 100644 --- a/tests/e2e/support/utils.js +++ b/tests/e2e/support/utils.js @@ -2,7 +2,7 @@ import { saveDebounce } from '../../../src/components/inspectors/inspectorConsta import path from 'path'; import { boundaryEventSelector, nodeTypes, taskSelector } from './constants'; -const renderTime = 500; +const renderTime = 5000; export function getTinyMceEditor() { return cy