From 839ed0b8e88e742c776e268c18f03f0aac877d8a Mon Sep 17 00:00:00 2001 From: Vladimirs Katusenoks Date: Fri, 20 May 2016 15:04:20 +0200 Subject: [PATCH] fix(paste): copy process with participant Closes camunda/camunda-modeler#297 --- lib/features/copy-paste/BpmnCopyPaste.js | 4 ++ .../features/copy-paste/BpmnCopyPasteSpec.js | 42 ++++++++++++++++--- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/lib/features/copy-paste/BpmnCopyPaste.js b/lib/features/copy-paste/BpmnCopyPaste.js index bb907b72..20a37594 100644 --- a/lib/features/copy-paste/BpmnCopyPaste.js +++ b/lib/features/copy-paste/BpmnCopyPaste.js @@ -133,6 +133,10 @@ function BpmnCopyPaste(bpmnFactory, eventBus, copyPaste, clipboard, moddle, canv descriptor.businessObject = businessObject = bpmnFactory.create(descriptor.type); + if (descriptor.type === 'bpmn:Participant' && descriptor.processRef) { + descriptor.processRef = businessObject.processRef = bpmnFactory.create('bpmn:Process'); + } + setProperties(businessObject, descriptor, [ 'name', 'text', diff --git a/test/spec/features/copy-paste/BpmnCopyPasteSpec.js b/test/spec/features/copy-paste/BpmnCopyPasteSpec.js index 0e45af4e..342af500 100644 --- a/test/spec/features/copy-paste/BpmnCopyPasteSpec.js +++ b/test/spec/features/copy-paste/BpmnCopyPasteSpec.js @@ -11,7 +11,8 @@ var bpmnCopyPasteModule = require('../../../../lib/features/copy-paste'), coreModule = require('../../../../lib/core'); var map = require('lodash/collection/map'), - forEach = require('lodash/collection/forEach'); + forEach = require('lodash/collection/forEach'), + uniq = require('lodash/array/uniq'); var DescriptorTree = require('./DescriptorTree'); @@ -432,23 +433,52 @@ describe('features/copy-paste', function() { it('multiple participants', inject(integrationTest([ 'Participant_0pgdgt4', 'Participant_1id96b4' ]))); + it('multiple participants', inject(integrationTest([ 'Participant_0pgdgt4', 'Participant_1id96b4' ]))); }); }); - describe('data associations', function() { + describe('participants', function() { beforeEach(bootstrapModeler(collaborationAssociations, { modules: testModules })); - describe('integration', function() { + it('copying participant should copy process as well', inject(function(elementRegistry, copyPaste, canvas) { + // given + var participants = map([ 'Participant_Input', 'Participant_Output' ], function (e) { + return elementRegistry.get(e); + }); + var rootElement = canvas.getRootElement(); - it('participant with OutputDataAssociation', inject(integrationTest([ 'Participant_Output' ]))); + // when + copyPaste.copy(participants); - it('participant with InputDataAssociation', inject(integrationTest([ 'Participant_Input' ]))); + copyPaste.paste({ + element: rootElement, + point: { + x: 4000, + y: 4500 + } + }); - }); + // then + var elements = elementRegistry.filter(function(element) { + return element.type === 'bpmn:Participant'; + }); + + var processIds = map(elements, function (e) { + return e.businessObject.processRef.id; + }); + + expect(uniq(processIds)).to.have.length(4); + })); + + + it('participant with OutputDataAssociation', inject(integrationTest([ 'Participant_Output' ]))); + + + it('participant with InputDataAssociation', inject(integrationTest([ 'Participant_Input' ]))); });