From ffb74800638417910f453e108c8a4c6ffabaee29 Mon Sep 17 00:00:00 2001 From: Vojta Jina Date: Mon, 23 Dec 2013 17:03:15 -0800 Subject: [PATCH] fix(launcher): compatibility with old launchers --- lib/launcher.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/launcher.js b/lib/launcher.js index 6719e877e..7d9341055 100644 --- a/lib/launcher.js +++ b/lib/launcher.js @@ -1,4 +1,5 @@ var log = require('./logger').create('launcher'); +var q = require('q'); var baseDecorator = require('./launchers/base').decoratorFactory; var captureTimeoutDecorator = require('./launchers/capture_timeout').decoratorFactory; @@ -66,8 +67,16 @@ var Launcher = function(emitter, injector) { return; } - // TODO(vojta): remove in v1.0 - browser.forceKill = browser.forceKill || browser.kill; + // TODO(vojta): remove in v1.0 (BC for old launchers) + if (!browser.forceKill) { + browser.forceKill = function() { + var deferred = q.defer(); + this.kill(function() { + deferred.resolve(); + }); + return deferred.promise; + }; + } log.info('Starting browser %s', browser.name); browser.start(url);