feat(runner/hosted): add support for promises for seleniumAddress and…

… capabilities

Change driverProviders/hosted to resolve promise values
in configuration to allow async jobs in setup. Specifically,
seleniumAddress, capabilities, and multiCapabilities may be promises. Primarily,
this would be for a network call to acquire a selenium host
or to start a proxy server.

lib/driverProviders/hosted.js

@@ -8,7 +8,6 @@ var util = require('util'),
     webdriver = require('selenium-webdriver'),
     q = require('q');
 
-
 var HostedDriverProvider = function(config) {
   this.config_ = config;
   this.driver_ = null;
@@ -21,8 +20,18 @@ var HostedDriverProvider = function(config) {
  *     ready to test.
  */
 HostedDriverProvider.prototype.setupEnv = function() {
-  util.puts('Using the selenium server at ' + this.config_.seleniumAddress);
-  return q.fcall(function() {});
+  var config = this.config_,
+      seleniumAddress = config.seleniumAddress;
+
+  if (q.isPromiseAlike(seleniumAddress)) {
+    return q.when(seleniumAddress).then(function(resolvedAddress) {
+      config.seleniumAddress = resolvedAddress;
+      util.puts('Using the selenium server at ' + config.seleniumAddress);
+    });
+  } else {
+    util.puts('Using the selenium server at ' + this.config_.seleniumAddress);
+    return q.fcall(function() {});
+  }
 };
 
 /**

lib/runner.js

@@ -232,12 +232,17 @@ Runner.prototype.run = function() {
 
   // 1) Setup environment
   return this.driverprovider_.setupEnv().then(function() {
-    driver = self.driverprovider_.getDriver();
-    return q.fcall(function() {});
+    return q.all(
+        [self.config_.capabilities, self.config_.multiCapabilities]).
+        spread(function(capabilites, multiCapabilities) {
+          self.config_.capabilities = capabilites;
+          self.config_.multiCapabilities = multiCapabilities;
+        }).then(function() {
+          driver = self.driverprovider_.getDriver();
+        });
 
     // 2) Execute test cases
   }).then(function() {
-
     var deferred = q.defer();
     driver.manage().timeouts().setScriptTimeout(self.config_.allScriptsTimeout);
     self.setupGlobals_.bind(self)(driver);

spec/driverprovider_test.js

@@ -52,7 +52,7 @@ testDriverProvider(require('../lib/driverProviders/chrome')(chromeConfig)).
     });
 
 var hostedConfig = {
-  sauceAddress: 'http://localhost:4444/wd/hub',
+  seleniumAddress: 'http://localhost:4444/wd/hub',
   capabilities: {
     browserName: 'firefox'
   }
@@ -64,6 +64,19 @@ testDriverProvider(require('../lib/driverProviders/hosted')(hostedConfig)).
       console.log('hosted.dp failed with ' + err);
     });
 
+var hostedPromisedConfig = {
+  seleniumAddress: q.when('http://localhost:4444/wd/hub'),
+  capabilities: {
+    browserName: 'firefox'
+  }
+};
+testDriverProvider(require('../lib/driverProviders/hosted')(hostedPromisedConfig)).
+    then(function() {
+      console.log('hosted.dp with promises working!');
+    }, function(err) {
+      console.log('hosted.dp with promises failed with ' + err);
+    });
+
 var localConfig = {
   seleniumArgs: [],
   capabilities: {

spec/unit/runner_test.js

@@ -30,11 +30,34 @@ describe('the Protractor runner', function() {
     });
   });
 
+  it('should wait for promise capabilities to resolve', function(done) {
+    var config = {
+      mockSelenium: true,
+      specs: ['*.js'],
+      framework: 'debugprint',
+      capabilities: q.when({
+        'browserName': 'customfortest'
+      })
+    };
+    var exitCode;
+    Runner.prototype.exit_ = function(exit) {
+      exitCode = exit;
+    };
+    var runner = new Runner(config);
+
+    runner.run().then(function() {
+      expect(runner.getConfig().capabilities.browserName).
+          toEqual('customfortest');
+      expect(exitCode).toEqual(0);
+      done();
+    });
+  });
+
   it('should fail with no specs', function() {
     var config = {
       mockSelenium: true,
       specs: [],
-      framework: 'simpleprint'
+      framework: 'debugprint'
     };
     var exitCode;
     Runner.prototype.exit_ = function(exit) {