updated execute so it makes the args paramter optional and added foll…

…ow redirects in an attempt to fix #106
nightwatchjs · Mar 28, 2014 · 1b559a6 · 1b559a6
1 parent 2652448
commit 1b559a6
Show file tree

Hide file tree

Showing 11 changed files with 243 additions and 60 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -66,17 +66,20 @@ util.inherits(Nightwatch, events.EventEmitter);
 Nightwatch.prototype.assertion = Assertion.assert;
 
 Nightwatch.prototype.setOptions = function(options) {
-  this.options = options || {};
+  this.options = {};
+  if (options && typeof options == 'object') {
+    for (var propName in options) {
+      this.options[propName] = options[propName];
+    }
+  }
 
   this.api.launchUrl = this.options.launchUrl || this.options.launch_url || null;
   // backwords compatibility
   this.api.launch_url = this.api.launchUrl;
 
-  if (this.options.globals) {
-    if (typeof this.options.globals == 'object') {
-      for (var globalKey in this.options.globals) {
-        this.api.globals[globalKey] = this.options.globals[globalKey];
-      }
+  if (this.options.globals && typeof this.options.globals == 'object') {
+    for (var globalKey in this.options.globals) {
+      this.api.globals[globalKey] = this.options.globals[globalKey];
     }
   }
 
@@ -130,7 +133,11 @@ Nightwatch.prototype.setOptions = function(options) {
 };
 
 Nightwatch.prototype.setCapabilities = function() {
-  this.desiredCapabilities = Nightwatch.DEFAULT_CAPABILITIES;
+  this.desiredCapabilities = {};
+  for (var capability in Nightwatch.DEFAULT_CAPABILITIES) {
+    this.desiredCapabilities[capability] = Nightwatch.DEFAULT_CAPABILITIES[capability];
+  }
+
   if (this.options.desiredCapabilities) {
     for (var prop in this.options.desiredCapabilities) {
       if (this.options.desiredCapabilities.hasOwnProperty(prop)) {
@@ -333,24 +340,27 @@ Nightwatch.prototype.handleTestError = function(result) {
   };
 };
 
-Nightwatch.prototype.startSession = function() {
+Nightwatch.prototype.startSession = function () {
   var self = this;
-  var request = new HttpRequest({
+  var options = {
     path : '/session',
     data : {
       desiredCapabilities : this.desiredCapabilities,
       sessionId : null
     }
-  });
+  };
 
-  request.on('success', function(data, response) {
-    if (data.sessionId) {
+  var request = new HttpRequest(options);
+  request.on('success', function(data, response, isRedirect) {
+    if (data && data.sessionId) {
       self.sessionId = self.api.sessionId = data.sessionId;
       if (data.value) {
         self.api.capabilities = data.value;
       }
       Logger.info('Got sessionId from selenium', self.sessionId);
       self.emit('selenium:session_create', self.sessionId, request, response);
+    } else if (isRedirect) {
+      self.followRedirect(request, response);
     } else {
       Logger.warn('Couldn\'t retrieve a new session from selenium server.');
     }
@@ -365,6 +375,24 @@ Nightwatch.prototype.startSession = function() {
   return this;
 };
 
+Nightwatch.prototype.followRedirect = function (request, response) {
+  if (!response.headers || !response.headers.location) {
+    this.emit('error', null, null);
+    return this;
+  }
+  var url = require('url');
+  var urlParts = url.parse(response.headers.location);
+
+  request.setOptions({
+    path   : urlParts.pathname,
+    host   : urlParts.hostname,
+    port   : urlParts.port,
+    method : 'GET'
+  }).send();
+
+  return this;
+};
+
 exports.client = function(options) {
   return new Nightwatch(options);
 };

diff --git a/lib/request.js b/lib/request.js
@@ -20,24 +20,32 @@ module.exports = (function() {
 
   function HttpRequest(options) {
     events.EventEmitter.call(this);
+    this.setOptions(options);
+  }
+
+  util.inherits(HttpRequest, events.EventEmitter);
+
+  HttpRequest.prototype.setOptions = function(options) {
     this.data          = options.data && JSON.stringify(options.data) || '';
     this.contentLength = this.data.length;
     this.reqOptions    = this.createOptions(options);
     this.request       = null;
-  }
 
-  util.inherits(HttpRequest, events.EventEmitter);
+    return this;
+  };
 
   HttpRequest.prototype.createOptions = function(options) {
+    var defaultPathPrefix = options.path && options.path.indexOf(Settings.default_path) === -1 ?
+      Settings.default_path : '';
+
     var reqOptions = {
-      path    : Settings.default_path + (options.path || ''),
+      path    : defaultPathPrefix + (options.path || ''),
       host    : options.host || Settings.selenium_host,
       port    : options.selenium_port || Settings.selenium_port,
       method  : options.method || 'POST',
       headers : {}
     };
     var requestMethod = reqOptions.method.toUpperCase();
-
     if (options.sessionId) {
       reqOptions.path = reqOptions.path.replace(':sessionId', options.sessionId);
     }
@@ -69,17 +77,10 @@ module.exports = (function() {
     this.request = (Settings.use_ssl ? https: http).request(this.reqOptions, function (response) {
       response.setEncoding('utf8');
 
-      if (response.statusCode === 302 || response.statusCode === 304) {
+      if (isRedirect(response.statusCode)) {
         Logger.info('Response ' + response.statusCode + ' ' + self.reqOptions.method + ' ' + self.reqOptions.path);
-        try {
-          self.emit('success', {}, response);
-        } catch (ex) {
-          console.log(ex.message);
-          console.log(ex.stack);
-          self.emit('error', {error:ex.message}, response);
-        }
-
-        self.emit('complete', response);
+        self.emit('success', {}, response, true);
+        //self.emit('complete', response);
         return self;
       }
 
@@ -164,6 +165,10 @@ module.exports = (function() {
   ///////////////////////////////////////////////////////////
   // Helpers
   ///////////////////////////////////////////////////////////
+  function isRedirect(statusCode) {
+    return [302, 303, 304].indexOf(statusCode) > -1;
+  }
+
   function needsContentLengthHeader(requestMethod) {
     return ['POST', 'DELETE'].indexOf(requestMethod) > -1;
   }

diff --git a/lib/selenium/protocol.js b/lib/selenium/protocol.js
@@ -494,7 +494,9 @@ module.exports = function(Nightwatch) {
       fn = script;
     }
 
-    if ((arguments.length === 3) && (typeof arguments[2] === 'function')) {
+    if (arguments.length === 2) {
+      args = [];
+    } else if ((arguments.length === 3) && (typeof arguments[2] === 'function')) {
       callback = arguments[2];
       args = [];
     }
@@ -530,10 +532,10 @@ module.exports = function(Nightwatch) {
    * @returns {*} The script result.
    */
   Actions.execute = function(body, args, callback) {
-    args = Array.prototype.slice.call(arguments, 0);
-    args.unshift('/execute');
+    var executeArgs = Array.prototype.slice.call(arguments, 0);
+    executeArgs.unshift('/execute');
 
-    return executeHandler.apply(null, args);
+    return executeHandler.apply(null, executeArgs);
   };
 
   /**

diff --git a/tests/mocks.json b/tests/mocks.json
@@ -7,16 +7,33 @@
       "response" : "{\"status\": 0, \"sessionId\": \"1352110219202\", \"value\": { \"javascriptEnabled\": true, \"browserName\": \"firefox\"}, \"state\": null}",
       "responseHeaders" : {
       },
-      "statusCode" : 200,
+      "statusCode" : 201,
       "method": "POST"
     },
+    {
+      "url" : "/wd/hub/session",
+      "postdata" : "{\"desiredCapabilities\":{\"browserName\":\"chrome\",\"javascriptEnabled\":true,\"acceptSslCerts\":true,\"platform\":\"ANY\"},\"sessionId\":null}",
+      "responseHeaders" : {
+        "location" : "http://localhost:10195/wd/hub/session/1352110219202"
+      },
+      "statusCode" : 302,
+      "method": "POST"
+    },
+    {
+      "url" : "/wd/hub/session/1352110219202",
+      "response" : "{\"status\": 0, \"sessionId\": \"1352110219202\", \"value\": { \"javascriptEnabled\": true, \"browserName\": \"chrome\"}, \"state\": null}",
+      "responseHeaders" : {
+      },
+      "statusCode" : 201,
+      "method": "GET"
+    },
     {
       "url" : "/wd/hub/session/1352110219202",
       "method": "DELETE"
     },
     {
       "url" : "/wd/hub/session/1352110219202/url",
-      "postdata" : "{\"url\":\"http://localhost\"}" 
+      "postdata" : "{\"url\":\"http://localhost\"}"
     },
     {
       "url" : "/wd/hub/test",

diff --git a/tests/nightwatch.js b/tests/nightwatch.js
@@ -1,15 +1,23 @@
 var nightwatch = require('../index.js');
 
 module.exports = {
-  init : function(callback) {
-    return nightwatch.client({
+  init : function(options, callback) {
+    var opts = {
       seleniumPort : 10195,
       silent : true,
       output : false,
       globals : {
         myGlobal : 'test'
       }
-    }).start().once('error', function() {
+    };
+
+    if (options) {
+      for (var prop in options) {
+        opts[prop] = options[prop];
+      }
+    }
+
+    return nightwatch.client(opts).start().once('error', function() {
       if (callback) {
         callback();
       }

diff --git a/tests/node_modules/mockserver.js b/tests/node_modules/mockserver.js
diff --git a/tests/run_tests.js b/tests/run_tests.js
@@ -25,13 +25,12 @@ process.chdir(__dirname);
 try {
   var server = require('mockserver').init();
   server.on('listening', function() {
-    reporter.run(['src', 'src/assertions', 'src/protocol', 'src/commands'], options, function() {
+    reporter.run(['src', 'src/index', 'src/assertions', 'src/protocol', 'src/commands'], options, function() {
+    //reporter.run(['src/index'], options, function() {
       server.close();
+      process.exit();
     });
   });
-
-
-  //reporter.run(['src/commands'], options);
 } catch (err) {
   console.log(e);
   process.exit();