diff --git a/test/fixtures/bpmn/render/activity-marker-combination.bpmn b/test/fixtures/bpmn/render/activity-markers-combination.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/activity-marker-combination.bpmn
rename to test/fixtures/bpmn/render/activity-markers-combination.bpmn
diff --git a/test/fixtures/bpmn/render/activity-marker.bpmn b/test/fixtures/bpmn/render/activity-markers.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/activity-marker.bpmn
rename to test/fixtures/bpmn/render/activity-markers.bpmn
diff --git a/test/fixtures/bpmn/render/conditional-default-flow.bpmn b/test/fixtures/bpmn/render/conditional-flow-default.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/conditional-default-flow.bpmn
rename to test/fixtures/bpmn/render/conditional-flow-default.bpmn
diff --git a/test/fixtures/bpmn/issue/bpmn-js-67.bpmn b/test/fixtures/bpmn/render/conditional-flow-gateways.bpmn
similarity index 100%
rename from test/fixtures/bpmn/issue/bpmn-js-67.bpmn
rename to test/fixtures/bpmn/render/conditional-flow-gateways.bpmn
diff --git a/test/fixtures/bpmn/render/conditional-flow-typed-task.bpmn b/test/fixtures/bpmn/render/conditional-flow-typed-task.bpmn
new file mode 100644
index 00000000..faf6bac4
--- /dev/null
+++ b/test/fixtures/bpmn/render/conditional-flow-typed-task.bpmn
@@ -0,0 +1,34 @@
+
+
+
+
+ SequenceFlow_1
+
+
+ FOO
+
+
+ SequenceFlow_1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/fixtures/bpmn/render/collapsed-event-subprocess.bpmn b/test/fixtures/bpmn/render/event-subprocesses-collapsed.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/collapsed-event-subprocess.bpmn
rename to test/fixtures/bpmn/render/event-subprocesses-collapsed.bpmn
diff --git a/test/fixtures/bpmn/render/expaned-event-sub-process.bpmn b/test/fixtures/bpmn/render/event-subprocesses-expanded.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/expaned-event-sub-process.bpmn
rename to test/fixtures/bpmn/render/event-subprocesses-expanded.bpmn
diff --git a/test/fixtures/bpmn/render/events-interrupting.bpmn b/test/fixtures/bpmn/render/events-interrupting.bpmn
index b7fe59e6..84fc0d79 100644
--- a/test/fixtures/bpmn/render/events-interrupting.bpmn
+++ b/test/fixtures/bpmn/render/events-interrupting.bpmn
@@ -1,99 +1,369 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/spec/browser/draw/BpmnRendererSpec.js b/test/spec/browser/draw/BpmnRendererSpec.js
index 3cdc9d8a..f33030d5 100644
--- a/test/spec/browser/draw/BpmnRendererSpec.js
+++ b/test/spec/browser/draw/BpmnRendererSpec.js
@@ -1,3 +1,5 @@
+'use strict';
+
var fs = require('fs');
var Viewer = require('../../../../lib/Viewer');
@@ -16,9 +18,10 @@ describe('draw/BpmnRenderer', function() {
document.getElementsByTagName('body')[0].appendChild(container);
});
- it('should render message flow message marker', function(done) {
- var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/message-marker.bpmn', 'utf8');
+ it('should render activity markers', function(done) {
+
+ var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/activity-markers.bpmn', 'utf8');
var renderer = new Viewer(container);
@@ -27,9 +30,10 @@ describe('draw/BpmnRenderer', function() {
});
});
- it('should render pool collection marker', function(done) {
- var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/pools-with-collection-marker.bpmn', 'utf8');
+ it('should render activity markers (combination)', function(done) {
+
+ var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/activity-markers-combination.bpmn', 'utf8');
var renderer = new Viewer(container);
@@ -38,16 +42,6 @@ describe('draw/BpmnRenderer', function() {
});
});
- it('should render conditional default flows', function(done) {
-
- var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/conditional-default-flow.bpmn', 'utf8');
-
- var renderer = new Viewer(container);
-
- renderer.importXML(xml, function(err) {
- done(err);
- });
- });
it('should render conditional flows', function(done) {
@@ -60,9 +54,10 @@ describe('draw/BpmnRenderer', function() {
});
});
- it('should render text annotations', function(done) {
- var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/text-annotation.bpmn', 'utf8');
+ it('should render conditional default flows', function(done) {
+
+ var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/conditional-flow-default.bpmn', 'utf8');
var renderer = new Viewer(container);
@@ -71,9 +66,10 @@ describe('draw/BpmnRenderer', function() {
});
});
- it('should render task types', function(done) {
- var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/task-types.bpmn', 'utf8');
+ it('should render NO conditional flow (gateway)', function(done) {
+
+ var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/conditional-flow-gateways.bpmn', 'utf8');
var renderer = new Viewer(container);
@@ -82,9 +78,10 @@ describe('draw/BpmnRenderer', function() {
});
});
- it('should render activity marker', function(done) {
- var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/activity-marker-combination.bpmn', 'utf8');
+ it('should render conditional flow (typed task)', function(done) {
+
+ var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/conditional-flow-typed-task.bpmn', 'utf8');
var renderer = new Viewer(container);
@@ -93,16 +90,6 @@ describe('draw/BpmnRenderer', function() {
});
});
- it('should render activity marker', function(done) {
-
- var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/activity-marker.bpmn', 'utf8');
-
- var renderer = new Viewer(container);
-
- renderer.importXML(xml, function(err) {
- done(err);
- });
- });
it('should render data objects', function(done) {
@@ -140,6 +127,30 @@ describe('draw/BpmnRenderer', function() {
});
+ it('should render event subprocesses (collapsed)', function(done) {
+
+ var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/event-subprocesses-collapsed.bpmn', 'utf8');
+
+ var renderer = new Viewer(container);
+
+ renderer.importXML(xml, function(err) {
+ done(err);
+ });
+ });
+
+
+ it('should render event subprocesses (expanded)', function(done) {
+
+ var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/event-subprocesses-expanded.bpmn', 'utf8');
+
+ var renderer = new Viewer(container);
+
+ renderer.importXML(xml, function(err) {
+ done(err);
+ });
+ });
+
+
it('should render gateways', function(done) {
var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/gateways.bpmn', 'utf8');
@@ -152,7 +163,7 @@ describe('draw/BpmnRenderer', function() {
});
- it('should render groups', function(done) {
+ it('should render group', function(done) {
var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/group.bpmn', 'utf8');
@@ -164,6 +175,18 @@ describe('draw/BpmnRenderer', function() {
});
+ it('should render message marker', function(done) {
+
+ var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/message-marker.bpmn', 'utf8');
+
+ var renderer = new Viewer(container);
+
+ renderer.importXML(xml, function(err) {
+ done(err);
+ });
+ });
+
+
it('should render pools', function(done) {
var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/pools.bpmn', 'utf8');
@@ -175,4 +198,40 @@ describe('draw/BpmnRenderer', function() {
});
});
+
+ it('should render pool collection marker', function(done) {
+
+ var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/pools-with-collection-marker.bpmn', 'utf8');
+
+ var renderer = new Viewer(container);
+
+ renderer.importXML(xml, function(err) {
+ done(err);
+ });
+ });
+
+
+ it('should render task types', function(done) {
+
+ var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/task-types.bpmn', 'utf8');
+
+ var renderer = new Viewer(container);
+
+ renderer.importXML(xml, function(err) {
+ done(err);
+ });
+ });
+
+
+ it('should render text annotations', function(done) {
+
+ var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/text-annotation.bpmn', 'utf8');
+
+ var renderer = new Viewer(container);
+
+ renderer.importXML(xml, function(err) {
+ done(err);
+ });
+ });
+
});
\ No newline at end of file