sartography
/
bpmn-js
mirror of https://github.com/sartography/bpmn-js.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(modeling/BpmnFactory): do not serialize point#original

This commit is contained in:
Nico Rehwaldt 2014-08-01 08:32:56 +02:00
parent cb77832fbe
commit 72729ce248
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/features/modeling/BpmnFactory.js
View File

@ -69,7 +69,7 @@ BpmnFactory.prototype.createDiWaypoints = function(waypoints) {
};
BpmnFactory.prototype.createDiWaypoint = function(point) {
return this.create('dc:Point', point);
return this.create('dc:Point', _.pick(point, [ 'x', 'y' ]));
};

42
test/spec/features/modeling/BpmnFactorySpec.js
View File

@ -11,7 +11,7 @@ var fs = require('fs');
var modelingModule = require('../../../../lib/features/modeling');
xdescribe('features - bpmn-factory', function() {
describe('features - bpmn-factory', function() {
beforeEach(Matchers.addDeepEquals);
@ -23,34 +23,30 @@ xdescribe('features - bpmn-factory', function() {
beforeEach(bootstrapBpmnJS(diagramXML, { modules: testModules }));
describe('create task', function() {
describe('create di', function() {
it('should create', inject(function(bpmnFactory) {
var result = bpmnFactory.createNode('bpmn:Task');
it('should create waypoints', inject(function(bpmnFactory) {
expect(result.semantic.id).toBeDefined();
expect(result.di.id).toBeDefined();
// given
var waypoints = [
{ original: { x: 0, y: 0 }, x: 0, y: 0 },
{ original: { x: 0, y: 0 }, x: 0, y: 0 }
];
expect(result.di.bounds.width).toBe(100);
expect(result.di.bounds.height).toBe(80);
expect(result.di.bounds.x).toBe(-50);
expect(result.di.bounds.y).toBe(-40);
// when
var result = bpmnFactory.createDiWaypoints(waypoints);
// then
expect(result).toDeepEqual([
{ $type: 'dc:Point', x: 0, y: 0 },
{ $type: 'dc:Point', x: 0, y: 0 }
]);
// expect original not to have been accidently serialized
expect(result[0].$attrs).toEqual({});
}));
it('should create with position', inject(function(bpmnFactory) {
var result = bpmnFactory.createNode('bpmn:Task', { x: 100, y: 100 });
expect(result.semantic.id).toBeDefined();
expect(result.di.id).toBeDefined();
expect(result.di.bounds.width).toBe(100);
expect(result.di.bounds.height).toBe(80);
expect(result.di.bounds.x).toBe(50);
expect(result.di.bounds.y).toBe(60);
}));
});
});