Merge pull request #776 from yhwh/fix-error

fix: launcher kill method which was throwing an error if no callback was...
karma-runner · Oct 18, 2013 · ee8303c · ee8303c
2 parents 0ada450 + 5439f1c
commit ee8303c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/launcher.js b/lib/launcher.js
@@ -53,7 +53,9 @@ var Launcher = function(emitter, injector) {
       }
     }
 
-    process.nextTick(callback);
+    if (callback) {
+      process.nextTick(callback);
+    }
     return false;
   };
 

diff --git a/test/unit/launcher.spec.coffee b/test/unit/launcher.spec.coffee
@@ -96,6 +96,13 @@ describe 'launcher', ->
         expect(l.kill 'weid-id', done).to.equal false
         expect(browser.kill).not.to.have.been.called
 
+      it 'should not resolve callback if none was defined', (done) ->
+        l.launch ['Fake']
+        browser = FakeBrowser._instances.pop()
+
+        expect(l.kill 'weid-id').to.equal false
+        process.nextTick ->
+          done()
 
     describe 'killAll', ->
       exitSpy = null