mirror of
https://github.com/bpmn-io/bpmn-js.git
synced 2026-03-13 10:30:34 +08:00
Merge master to develop
This commit is contained in:
@@ -108,7 +108,7 @@ export default function BpmnCopyPaste(bpmnFactory, eventBus, moddleCopy) {
|
||||
property = reference.property;
|
||||
|
||||
if (key === descriptor.id) {
|
||||
element[ property ] = businessObject;
|
||||
element.set(property, businessObject);
|
||||
|
||||
array.push(descriptor.id);
|
||||
}
|
||||
|
||||
@@ -227,7 +227,7 @@ describe('features/copy-paste', function() {
|
||||
|
||||
describe('integration', function() {
|
||||
|
||||
it('should copy conditional and default flow properties',
|
||||
it('should copy conditionExpression and default flow properties',
|
||||
inject(function(canvas, copyPaste, elementRegistry, modeling) {
|
||||
|
||||
// given
|
||||
@@ -264,11 +264,12 @@ describe('features/copy-paste', function() {
|
||||
|
||||
expect(conditionalFlow).to.exist;
|
||||
expect(defaultFlow).to.exist;
|
||||
expect(Object.prototype.propertyIsEnumerable.call(taskBo, 'default')).to.be.false;
|
||||
})
|
||||
);
|
||||
|
||||
|
||||
it('should copy attacher properties', inject(function(canvas, copyPaste, elementRegistry) {
|
||||
it('should copy attachedToRef properties', inject(function(canvas, copyPaste, elementRegistry) {
|
||||
|
||||
// given
|
||||
var task = elementRegistry.get('Task_1'),
|
||||
@@ -296,11 +297,13 @@ describe('features/copy-paste', function() {
|
||||
});
|
||||
|
||||
// then
|
||||
expect(getBusinessObject(boundaryEvent).attachedToRef).to.equal(getBusinessObject(task));
|
||||
var boundaryEventBo = getBusinessObject(boundaryEvent);
|
||||
|
||||
expect(boundaryEventBo.attachedToRef).to.equal(getBusinessObject(task));
|
||||
}));
|
||||
|
||||
|
||||
it('should copy loop characteristics porperties',
|
||||
it('should copy loopCharacteristics properties',
|
||||
inject(function(canvas, copyPaste, elementRegistry, modeling) {
|
||||
|
||||
// given
|
||||
@@ -375,7 +378,7 @@ describe('features/copy-paste', function() {
|
||||
|
||||
|
||||
it('should copy label', inject(
|
||||
function(canvas, copyPaste, elementRegistry, modeling) {
|
||||
function(canvas, copyPaste, elementRegistry) {
|
||||
|
||||
// given
|
||||
var startEvent = elementRegistry.get('StartEvent_1'),
|
||||
|
||||
Reference in New Issue
Block a user