Provide a way to customise the port Selenium starts on

Fixes daaku#7
mmetcalfe-pulsemining · Jan 13, 2015 · 39f969d · 39f969d
1 parent d754ca5
commit 39f969d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/lib/selenium-launcher.js b/lib/selenium-launcher.js
@@ -52,9 +52,8 @@ function download(url, outfile, expectedSha, cb) {
   })
 }
 
-function run(cb) {
-  freeport(function(er, port) {
-    if (er) throw er;
+function run(cb, port) {
+  function runOnPort(cb, port) {
     console.log('Starting Selenium ' + version + ' on port ' + port);
     console.log('Filename: ' + outfile);
     var child = spawn('java', [
@@ -73,7 +72,16 @@ function run(cb) {
       }
     })
     child.on('exit', badExit)
-  })
+  }
+
+  if (typeof port === 'undefined') {
+    freeport(function (er, port) {
+      if (er) throw er;
+      runOnPort(cb, port)
+    })
+  } else {
+    runOnPort(cb, port)
+  }
 }
 
 function FakeProcess(port) {
@@ -86,14 +94,14 @@ FakeProcess.prototype.kill = function() {
   this.emit('exit');
 }
 
-module.exports = function(cb) {
+module.exports = function(cb, port) {
   if (process.env.SELENIUM_LAUNCHER_PORT) {
     return process.nextTick(
       cb.bind(null, null, new FakeProcess(process.env.SELENIUM_LAUNCHER_PORT)))
   }
 
   download(url, outfile, expectedSha, function(er) {
     if (er) return cb(er)
-    run(cb)
+    run(cb, port)
   })
 }
diff --git a/test/sanity.js b/test/sanity.js
@@ -40,4 +40,13 @@ describe("sanity", function(){
     })
   });
 
+  it('should get the server port from the optional parameter', function(done) {
+    seleniumLauncher(function(er, selenium) {
+      if (er) return done(er);
+      assert.equal(selenium.port, 4444);
+      selenium.on('exit', function() { done() })
+      selenium.kill()
+    }, 4444)
+  });
+
 });