Merge branch 'master' into feature/bpmn-definition

paed01 · Feb 4, 2017 · 99b5bf4 · 99b5bf4
2 parents 0c2fee6 + 6170cac
commit 99b5bf4
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 12 deletions.
diff --git a/lib/Engine.js b/lib/Engine.js
@@ -35,7 +35,6 @@ module.exports = internals.Engine = function(options) {
 internals.Engine.prototype = Object.create(EventEmitter.prototype);
 
 internals.Engine.prototype.execute = function(executeOptionsOrCallback, callback) {
-  const scope = this;
   let executeOptions;
   if (typeof executeOptionsOrCallback === 'function') {
     callback = executeOptionsOrCallback;
@@ -45,26 +44,24 @@ internals.Engine.prototype.execute = function(executeOptionsOrCallback, callback
     executeOptions = executeOptionsOrCallback;
   }
 
-  function innerCallback(err) {
-    if (err && !callback) {
-      return scope.emit('error', err);
-    }
+  function executeCallback(err) {
     if (callback) return callback.apply(null, arguments);
+    if (err) this.emit('error', err);
   }
 
-  scope.getDefinitions((getErr, definitions) => {
-    if (getErr) return innerCallback(getErr);
-    if (!definitions.length) return innerCallback(new Error('Nothing to execute'));
+  this.getDefinitions((getErr, definitions) => {
+    if (getErr) return executeCallback.call(this, getErr);
+    if (!definitions.length) return executeCallback.call(this, new Error('Nothing to execute'));
 
-    debug(`<${scope.name}>`, `start all definitions (${definitions.length})`);
+    debug(`<${this.name}>`, `start all definitions (${definitions.length})`);
 
-    setupDefinitions.call(scope, definitions);
+    setupDefinitions.call(this, definitions);
 
-    scope.started = true;
+    this.started = true;
     Async.each(definitions, (d, next) => {
       d.execute(executeOptions, next);
     }, (err) => {
-      innerCallback(err, definitions[0], definitions);
+      executeCallback.call(this, err, definitions[0], definitions);
     });
   });
 };

diff --git a/test/Engine-test.js b/test/Engine-test.js
@@ -155,6 +155,17 @@ lab.experiment('Engine', () => {
   });
 
   lab.describe('execute()', () => {
+    lab.test('without arguments runs process', (done) => {
+      const engine = new Bpmn.Engine({
+        source: factory.valid()
+      });
+      engine.once('end', () => {
+        done();
+      });
+
+      engine.execute();
+    });
+
     lab.test('returns error in callback if no source', (done) => {
       const engine = new Bpmn.Engine({
         source: ''
@@ -175,6 +186,18 @@ lab.experiment('Engine', () => {
       });
     });
 
+    lab.test('emits error if not well formatted xml', (done) => {
+      const engine = new Bpmn.Engine({
+        source: 'jdalsk'
+      });
+      engine.once('error', (err) => {
+        expect(err).to.be.an.error();
+        done();
+      });
+
+      engine.execute();
+    });
+
     lab.test('returns error in callback if no executable process', (done) => {
       const processXml = `
 <?xml version="1.0" encoding="UTF-8"?>