From bcc5820754d7cd1a8da3488f29e092664fad66b1 Mon Sep 17 00:00:00 2001 From: Maciej Barelkowski Date: Fri, 25 Jun 2021 10:02:12 +0200 Subject: [PATCH 1/3] deps: update bpmn-moddle to v7.1.2 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index f52de822..b53b2cd0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2242,9 +2242,9 @@ "dev": true }, "bpmn-moddle": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/bpmn-moddle/-/bpmn-moddle-7.1.1.tgz", - "integrity": "sha512-R3xDuTklpK2NtxVDHJiecEVJvY2hKZikXdyl7oaULHMCQPfTBdid7TU/LGUgrLjA3L3ihBN9AKPgcAQ6HoPjpA==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/bpmn-moddle/-/bpmn-moddle-7.1.2.tgz", + "integrity": "sha512-Sax4LokRCTqlg26njjULN3ZGtCmwH5gZVUZTRF0jwJk+YpMQhSfSoUECxjNv8OROoLxu8Z+MjdOHIxgvJf7KwA==", "requires": { "min-dash": "^3.5.2", "moddle": "^5.0.2", diff --git a/package.json b/package.json index 266c4c8a..c4af04f8 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "webpack": "^4.44.2" }, "dependencies": { - "bpmn-moddle": "^7.1.1", + "bpmn-moddle": "^7.1.2", "css.escape": "^1.5.1", "diagram-js": "^7.3.0", "diagram-js-direct-editing": "^1.6.3", From 5c6982017bdb938d8d1fae6316a11b2c0ed0f113 Mon Sep 17 00:00:00 2001 From: Maciej Barelkowski Date: Fri, 25 Jun 2021 10:24:49 +0200 Subject: [PATCH 2/3] test(bpmn-rules): verify CallActivity can connect with MessageFlow Closes #1467 --- .../rules/BpmnRules.collaboration.bpmn | 148 +++++++++--------- test/spec/features/rules/BpmnRulesSpec.js | 11 ++ 2 files changed, 87 insertions(+), 72 deletions(-) diff --git a/test/spec/features/rules/BpmnRules.collaboration.bpmn b/test/spec/features/rules/BpmnRules.collaboration.bpmn index b7406d1a..cb25eac5 100644 --- a/test/spec/features/rules/BpmnRules.collaboration.bpmn +++ b/test/spec/features/rules/BpmnRules.collaboration.bpmn @@ -1,5 +1,5 @@ - + @@ -51,129 +51,133 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + - - - - - - - + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - + - - + + - + + + + + + + - + - - + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - - - - - - - - - - - diff --git a/test/spec/features/rules/BpmnRulesSpec.js b/test/spec/features/rules/BpmnRulesSpec.js index 1d229d9d..6647aa4e 100644 --- a/test/spec/features/rules/BpmnRulesSpec.js +++ b/test/spec/features/rules/BpmnRulesSpec.js @@ -1204,6 +1204,17 @@ describe('features/modeling/rules - BpmnRules', function() { })); + it('connect CallActivity -> Participant', function() { + + expectCanConnect('CallActivity', 'Participant', { + sequenceFlow: false, + messageFlow: true, + association: false, + dataAssociation: false + }); + }); + + it('drop TextAnnotation_Global -> Participant', inject(function() { expectCanDrop('TextAnnotation_Global', 'Participant', true); })); From a1520ef23cfec8a6f76388d8f7f8a226df20b7c0 Mon Sep 17 00:00:00 2001 From: Maciej Barelkowski Date: Fri, 25 Jun 2021 11:02:10 +0200 Subject: [PATCH 3/3] 8.7.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index b53b2cd0..9b01f5ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "bpmn-js", - "version": "8.7.0", + "version": "8.7.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c4af04f8..39542c77 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bpmn-js", - "version": "8.7.0", + "version": "8.7.1", "description": "A bpmn 2.0 toolkit and web modeler", "main": "index.js", "files": [