poltergeist 1.8.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba9a64217db44bbe9dcbe55e34cac615640688df
-  data.tar.gz: 7bd5f0ae85f2565e1b6c07f4030644f59eccbb1f
+  metadata.gz: 30764c7fffa008722381c14b695751179d6f2aa4
+  data.tar.gz: bc9747887101bf79414e69442b39144ca7af0ef4
 SHA512:
-  metadata.gz: 93141f4f1e6438da75f912f4174f5f7f987d9fcff0dbaab0fa7eff384a6501067b6fcbf06eb06f9589e71457a8ee563ab84ff11d0ff9b83828fbd8e531b9eb00
-  data.tar.gz: 54b08a29b4707dfdb8c3a7ff2a7c16194ca100e87cfc89d1e5f11f17f7f151121260cfdf10584949100f66de17ff57b5ed574273268580e75ca7729533a484f9
+  metadata.gz: d2cf7f4946e9e46ef9e7cdbd56c4a7e789342799b9b05c2b5e89833c7ef4d706331c9ae29a866efdae4b15311470e4797b2a716044b6cc61f2efda57dd89687d
+  data.tar.gz: 5238c2b847c294019d1b7e7a13393c43aa5d96d1ba7bd7591a1a81ecfdeaea9d90a43a6dc279de095310eef8670b82fe01fd2528bc6ad04b9156cea61ccbc600

data/README.md

@@ -22,7 +22,13 @@ to read the bug reporting guidance below).
 
 ## Installation ##
 
-Add `poltergeist` to your Gemfile, and in your test setup add:
+Add this line to your Gemfile and run `bundle install`:
+
+``` ruby
+gem 'poltergeist'
+```
+
+In your test setup add:
 
 ``` ruby
 require 'capybara/poltergeist'
@@ -82,7 +88,7 @@ was 1.0.2, so you should use that if you still need Ruby 1.8 support.
 There are no special steps to take. You don't need Xvfb or any running X
 server at all.
 
-[Travis CI](https://travis-ci.org/) has PhantomJS pre-installed.
+[Travis CI](https://travis-ci.org/) and [Codeship](https://codeship.com/) has PhantomJS pre-installed.
 
 Depending on your tests, one thing that you may need is some fonts. If
 you're getting errors on a CI that don't occur during development then

data/lib/capybara/poltergeist/browser.rb

@@ -324,6 +324,10 @@ module Capybara::Poltergeist
       end
     end
 
+    def url_whitelist=(whitelist)
+      command 'set_url_whitelist', *whitelist
+    end
+
     def url_blacklist=(blacklist)
       command 'set_url_blacklist', *blacklist
     end

data/lib/capybara/poltergeist/client/agent.coffee

@@ -257,6 +257,12 @@ class PoltergeistAgent.Node
     @element.tagName
 
   isVisible: (element = @element) ->
+    #if an area element, check visibility of relevant image
+    if element.tagName == 'AREA'
+      map_name = document.evaluate('./ancestor::map/@name', element, null, XPathResult.STRING_TYPE, null).stringValue
+      element = document.querySelector("img[usemap='##{map_name}']")
+      return false unless element?
+
     while (element)
       style = window.getComputedStyle(element)
       return false if style.display == 'none' or

data/lib/capybara/poltergeist/client/browser.coffee

@@ -82,8 +82,7 @@ class Poltergeist.Browser
     else
       throw new Poltergeist.ObsoleteNode
 
-  visit: (url) ->
-
+  visit: (url, max_wait=0) ->
     @currentPage.state = 'loading'
     #reset modal processing state when changing page
     @processed_modal_messages = []
@@ -109,6 +108,11 @@ class Poltergeist.Browser
           command.sendError(new Poltergeist.StatusFailError(url))
         else
           command.sendResponse(status: @currentPage.status)
+      , max_wait, =>
+        resources = @currentPage.openResourceRequests()
+        msg = if resources.length
+          "Timed out with the following resources still waiting #{@currentPage.openResourceRequests().join(',')}"
+        command.sendError(new Poltergeist.StatusFailError(url,msg))
       return
 
   current_url: ->
@@ -169,8 +173,8 @@ class Poltergeist.Browser
     @currentPage.beforeUpload(node.id)
     @currentPage.uploadFile('[_poltergeist_selected]', value)
     @currentPage.afterUpload(node.id)
-    if phantom.version.major == 2
-      # In phantomjs 2 - uploadFile only fully works if executed within a user action
+    if phantom.version.major == 2 && phantom.version.minor == 0
+      # In phantomjs 2.0.x - uploadFile only fully works if executed within a user action
       # It does however setup the filenames to be uploaded, so if we then click on the
       # file input element the filenames will get set
       @click(page_id, id)
@@ -481,6 +485,10 @@ class Poltergeist.Browser
     else
       command.sendResponse(false)
 
+  set_url_whitelist: ->
+    @currentPage.urlWhitelist = Array.prototype.slice.call(arguments)
+    @current_command.sendResponse(true)
+
   set_url_blacklist: ->
     @currentPage.urlBlacklist = Array.prototype.slice.call(arguments)
     @current_command.sendResponse(true)

data/lib/capybara/poltergeist/client/compiled/agent.js

@@ -381,10 +381,17 @@ PoltergeistAgent.Node = (function() {
   };
 
   Node.prototype.isVisible = function(element) {
-    var style;
+    var map_name, style;
     if (element == null) {
       element = this.element;
     }
+    if (element.tagName === 'AREA') {
+      map_name = document.evaluate('./ancestor::map/@name', element, null, XPathResult.STRING_TYPE, null).stringValue;
+      element = document.querySelector("img[usemap='#" + map_name + "']");
+      if (element == null) {
+        return false;
+      }
+    }
     while (element) {
       style = window.getComputedStyle(element);
       if (style.display === 'none' || style.visibility === 'hidden' || parseFloat(style.opacity) === 0) {

data/lib/capybara/poltergeist/client/compiled/browser.js

@@ -108,8 +108,11 @@ Poltergeist.Browser = (function() {
     }
   };
 
-  Browser.prototype.visit = function(url) {
+  Browser.prototype.visit = function(url, max_wait) {
     var command, prevUrl;
+    if (max_wait == null) {
+      max_wait = 0;
+    }
     this.currentPage.state = 'loading';
     this.processed_modal_messages = [];
     this.confirm_processes = [];
@@ -133,6 +136,13 @@ Poltergeist.Browser = (function() {
             });
           }
         };
+      })(this), max_wait, (function(_this) {
+        return function() {
+          var msg, resources;
+          resources = _this.currentPage.openResourceRequests();
+          msg = resources.length ? "Timed out with the following resources still waiting " + (_this.currentPage.openResourceRequests().join(',')) : void 0;
+          return command.sendError(new Poltergeist.StatusFailError(url, msg));
+        };
       })(this));
     }
   };
@@ -211,7 +221,7 @@ Poltergeist.Browser = (function() {
     this.currentPage.beforeUpload(node.id);
     this.currentPage.uploadFile('[_poltergeist_selected]', value);
     this.currentPage.afterUpload(node.id);
-    if (phantom.version.major === 2) {
+    if (phantom.version.major === 2 && phantom.version.minor === 0) {
       return this.click(page_id, id);
     } else {
       return this.current_command.sendResponse(true);
@@ -653,6 +663,11 @@ Poltergeist.Browser = (function() {
     }
   };
 
+  Browser.prototype.set_url_whitelist = function() {
+    this.currentPage.urlWhitelist = Array.prototype.slice.call(arguments);
+    return this.current_command.sendResponse(true);
+  };
+
   Browser.prototype.set_url_blacklist = function() {
     this.currentPage.urlBlacklist = Array.prototype.slice.call(arguments);
     return this.current_command.sendResponse(true);

data/lib/capybara/poltergeist/client/compiled/main.js

@@ -182,14 +182,15 @@ Poltergeist.BrowserError = (function(superClass) {
 Poltergeist.StatusFailError = (function(superClass) {
   extend(StatusFailError, superClass);
 
-  function StatusFailError(url) {
+  function StatusFailError(url, details) {
     this.url = url;
+    this.details = details;
   }
 
   StatusFailError.prototype.name = "Poltergeist.StatusFailError";
 
   StatusFailError.prototype.args = function() {
-    return [this.url];
+    return [this.url, this.details];
   };
 
   return StatusFailError;

data/lib/capybara/poltergeist/client/compiled/node.js

@@ -1,7 +1,7 @@
 var slice = [].slice;
 
 Poltergeist.Node = (function() {
-  var fn, i, len, name, ref;
+  var fn, j, len, name, ref;
 
   Node.DELEGATES = ['allText', 'visibleText', 'getAttribute', 'value', 'set', 'setAttribute', 'isObsolete', 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find', 'getAttributes', 'isVisible', 'isInViewport', 'position', 'trigger', 'parentId', 'parentIds', 'mouseEventTest', 'scrollIntoView', 'isDOMEqual', 'isDisabled', 'deleteText', 'containsSelection', 'path', 'getProperty'];
 
@@ -22,27 +22,41 @@ Poltergeist.Node = (function() {
       return this.page.nodeCall(this.id, name, args);
     };
   };
-  for (i = 0, len = ref.length; i < len; i++) {
-    name = ref[i];
+  for (j = 0, len = ref.length; j < len; j++) {
+    name = ref[j];
     fn(name);
   }
 
   Node.prototype.mouseEventPosition = function() {
-    var middle, pos, viewport;
+    var area_offset, image, middle, pos, res, viewport;
     viewport = this.page.viewportSize();
-    pos = this.position();
+    if (image = this._getAreaImage()) {
+      pos = image.position();
+      if (area_offset = this._getAreaOffsetRect()) {
+        pos.left = pos.left + area_offset.x;
+        pos.right = pos.left + area_offset.width;
+        pos.top = pos.top + area_offset.y;
+        pos.bottom = pos.top + area_offset.height;
+      }
+    } else {
+      pos = this.position();
+    }
     middle = function(start, end, size) {
       return start + ((Math.min(end, size) - start) / 2);
     };
-    return {
+    return res = {
       x: middle(pos.left, pos.right, viewport.width),
       y: middle(pos.top, pos.bottom, viewport.height)
     };
   };
 
   Node.prototype.mouseEvent = function(name) {
-    var pos, test;
-    this.scrollIntoView();
+    var area_image, pos, test;
+    if (area_image = this._getAreaImage()) {
+      area_image.scrollIntoView();
+    } else {
+      this.scrollIntoView();
+    }
     pos = this.mouseEventPosition();
     test = this.mouseEventTest(pos.x, pos.y);
     if (test.status === 'success') {
@@ -83,6 +97,91 @@ Poltergeist.Node = (function() {
     return this.page === other.page && this.isDOMEqual(other.id);
   };
 
+  Node.prototype._getAreaOffsetRect = function() {
+    var centerX, centerY, coord, coords, i, maxX, maxY, minX, minY, radius, rect, shape, x, xs, y, ys;
+    shape = this.getAttribute('shape').toLowerCase();
+    coords = (function() {
+      var k, len1, ref1, results;
+      ref1 = this.getAttribute('coords').split(',');
+      results = [];
+      for (k = 0, len1 = ref1.length; k < len1; k++) {
+        coord = ref1[k];
+        results.push(parseInt(coord, 10));
+      }
+      return results;
+    }).call(this);
+    return rect = (function() {
+      switch (shape) {
+        case 'rect':
+        case 'rectangle':
+          x = coords[0], y = coords[1];
+          return {
+            x: x,
+            y: y,
+            width: coords[2] - x,
+            height: coords[3] - y
+          };
+        case 'circ':
+        case 'circle':
+          centerX = coords[0], centerY = coords[1], radius = coords[2];
+          return {
+            x: centerX - radius,
+            y: centerY - radius,
+            width: 2 * radius,
+            height: 2 * radius
+          };
+        case 'poly':
+        case 'polygon':
+          xs = (function() {
+            var k, ref1, results;
+            results = [];
+            for (i = k = 0, ref1 = coords.length; k < ref1; i = k += 2) {
+              results.push(coords[i]);
+            }
+            return results;
+          })();
+          ys = (function() {
+            var k, ref1, results;
+            results = [];
+            for (i = k = 1, ref1 = coords.length; k < ref1; i = k += 2) {
+              results.push(coords[i]);
+            }
+            return results;
+          })();
+          minX = Math.min.apply(Math, xs);
+          maxX = Math.max.apply(Math, xs);
+          minY = Math.min.apply(Math, ys);
+          maxY = Math.max.apply(Math, ys);
+          return {
+            x: minX,
+            y: minY,
+            width: maxX - minX,
+            height: maxY - minY
+          };
+      }
+    })();
+  };
+
+  Node.prototype._getAreaImage = function() {
+    var image_node_id, map, mapName;
+    if ('area' === this.tagName().toLowerCase()) {
+      map = this.parent();
+      if (map.tagName().toLowerCase() !== 'map') {
+        throw new Error('the area is not within a map');
+      }
+      mapName = map.getAttribute('name');
+      if (mapName == null) {
+        throw new Error("area's parent map must have a name");
+      }
+      mapName = '#' + mapName.toLowerCase();
+      image_node_id = this.page.find('css', "img[usemap='" + mapName + "']")[0];
+      if (image_node_id == null) {
+        throw new Error("no image matches the map");
+      }
+      return this.page.get(image_node_id);
+    }
+  };
+
   return Node;
 
 })();

data/lib/capybara/poltergeist/client/compiled/web_page.js

@@ -1,5 +1,6 @@
 var slice = [].slice,
-  indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
+  indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; },
+  hasProp = {}.hasOwnProperty;
 
 Poltergeist.WebPage = (function() {
   var command, delegate, fn1, fn2, i, j, len, len1, ref, ref1;
@@ -20,12 +21,14 @@ Poltergeist.WebPage = (function() {
     this.source = null;
     this.closed = false;
     this.state = 'default';
+    this.urlWhitelist = [];
     this.urlBlacklist = [];
     this.frames = [];
     this.errors = [];
     this._networkTraffic = {};
     this._tempHeaders = {};
     this._blockedUrls = [];
+    this._requestedResources = {};
     ref = WebPage.CALLBACKS;
     for (i = 0, len = ref.length; i < len; i++) {
       callback = ref[i];
@@ -84,7 +87,8 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.onLoadStartedNative = function() {
     this.state = 'loading';
-    return this.requestId = this.lastRequestId;
+    this.requestId = this.lastRequestId;
+    return this._requestedResources = {};
   };
 
   WebPage.prototype.onLoadFinishedNative = function(status) {
@@ -111,10 +115,21 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.onResourceRequestedNative = function(request, net) {
-    var abort, ref2;
-    abort = this.urlBlacklist.some(function(blacklisted_url) {
+    var abort, blacklisted, ref2, useWhitelist, whitelisted;
+    useWhitelist = this.urlWhitelist.length > 0;
+    whitelisted = this.urlWhitelist.some(function(whitelisted_url) {
+      return request.url.indexOf(whitelisted_url) !== -1;
+    });
+    blacklisted = this.urlBlacklist.some(function(blacklisted_url) {
       return request.url.indexOf(blacklisted_url) !== -1;
     });
+    abort = false;
+    if (useWhitelist && !whitelisted) {
+      abort = true;
+    }
+    if (blacklisted) {
+      abort = true;
+    }
     if (abort) {
       if (ref2 = request.url, indexOf.call(this._blockedUrls, ref2) < 0) {
         this._blockedUrls.push(request.url);
@@ -131,6 +146,7 @@ Poltergeist.WebPage = (function() {
         responseParts: [],
         error: null
       };
+      this._requestedResources[request.id] = request.url;
     }
     return true;
   };
@@ -140,6 +156,9 @@ Poltergeist.WebPage = (function() {
     if ((ref2 = this._networkTraffic[response.id]) != null) {
       ref2.responseParts.push(response);
     }
+    if (response.stage === 'end') {
+      delete this._requestedResources[response.id];
+    }
     if (this.requestId === response.id) {
       if (response.redirectURL) {
         this.redirectURL = this.normalizeURL(response.redirectURL);
@@ -156,6 +175,7 @@ Poltergeist.WebPage = (function() {
     if ((ref2 = this._networkTraffic[errorResponse.id]) != null) {
       ref2.error = errorResponse;
     }
+    delete this._requestedResources[errorResponse.id];
     return true;
   };
 
@@ -213,15 +233,46 @@ Poltergeist.WebPage = (function() {
     })(this));
   };
 
-  WebPage.prototype.waitState = function(state, callback) {
+  WebPage.prototype._waitState_until = function(state, callback, timeout, timeout_callback) {
+    var d;
+    if (this.state === state) {
+      return callback.call();
+    } else {
+      d = new Date();
+      if (d.getTime() > timeout) {
+        return timeout_callback.call();
+      } else {
+        return setTimeout(((function(_this) {
+          return function() {
+            return _this._waitState_until(state, callback, timeout, timeout_callback);
+          };
+        })(this)), 100);
+      }
+    }
+  };
+
+  WebPage.prototype.waitState = function(state, callback, max_wait, timeout_callback) {
+    var timeout;
+    if (max_wait == null) {
+      max_wait = 0;
+    }
     if (this.state === state) {
       return callback.call();
     } else {
-      return setTimeout(((function(_this) {
-        return function() {
-          return _this.waitState(state, callback);
-        };
-      })(this)), 100);
+      if (max_wait !== 0) {
+        timeout = (new Date).getTime() + (max_wait * 1000);
+        return setTimeout(((function(_this) {
+          return function() {
+            return _this._waitState_until(state, callback, timeout, timeout_callback);
+          };
+        })(this)), 100);
+      } else {
+        return setTimeout(((function(_this) {
+          return function() {
+            return _this.waitState(state, callback);
+          };
+        })(this)), 100);
+      }
     }
   };
 
@@ -249,6 +300,18 @@ Poltergeist.WebPage = (function() {
     return true;
   };
 
+  WebPage.prototype.openResourceRequests = function() {
+    var id, ref2, results, url;
+    ref2 = this._requestedResources;
+    results = [];
+    for (id in ref2) {
+      if (!hasProp.call(ref2, id)) continue;
+      url = ref2[id];
+      results.push(url);
+    }
+    return results;
+  };
+
   WebPage.prototype.content = function() {
     return this["native"]().frameContent;
   };

data/lib/capybara/poltergeist/client/main.coffee

@@ -79,9 +79,9 @@ class Poltergeist.BrowserError extends Poltergeist.Error
   args: -> [@message, @stack]
 
 class Poltergeist.StatusFailError extends Poltergeist.Error
-  constructor: (@url) ->
+  constructor: (@url, @details) ->
   name: "Poltergeist.StatusFailError"
-  args: -> [@url]
+  args: -> [@url, @details]
 
 class Poltergeist.NoSuchWindowError extends Poltergeist.Error
   name: "Poltergeist.NoSuchWindowError"

data/lib/capybara/poltergeist/client/node.coffee

@@ -19,18 +19,32 @@ class Poltergeist.Node
 
   mouseEventPosition: ->
     viewport = @page.viewportSize()
-    pos      = this.position()
+
+    if image = @_getAreaImage()
+      pos = image.position()
+
+      if area_offset = @_getAreaOffsetRect()
+        pos.left = pos.left + area_offset.x
+        pos.right = pos.left + area_offset.width
+        pos.top = pos.top + area_offset.y
+        pos.bottom = pos.top + area_offset.height
+    else
+      pos = this.position()
 
     middle = (start, end, size) ->
       start + ((Math.min(end, size) - start) / 2)
 
-    {
+    res = {
       x: middle(pos.left, pos.right,  viewport.width),
       y: middle(pos.top,  pos.bottom, viewport.height)
     }
 
+
   mouseEvent: (name) ->
-    this.scrollIntoView()
+    if area_image = @_getAreaImage()
+      area_image.scrollIntoView()
+    else
+      @scrollIntoView()
     pos = this.mouseEventPosition()
     test = this.mouseEventTest(pos.x, pos.y)
     if test.status == 'success'
@@ -68,3 +82,46 @@ class Poltergeist.Node
   isEqual: (other) ->
     @page == other.page && this.isDOMEqual(other.id)
 
+  _getAreaOffsetRect: ->
+    # get the offset of the center of selected area
+    shape = @getAttribute('shape').toLowerCase();
+    coords = (parseInt(coord,10) for coord in @getAttribute('coords').split(','))
+
+    rect = switch shape
+      when 'rect', 'rectangle'
+        #coords.length == 4
+        [x,y] = coords
+        { x: x, y: y, width: coords[2] - x, height: coords[3] - y }
+      when 'circ', 'circle'
+        # coords.length == 3
+        [centerX, centerY, radius] = coords
+        { x: centerX - radius, y: centerY - radius, width: 2 * radius, height: 2 * radius }
+      when 'poly', 'polygon'
+        # coords.length > 2
+        # This isn't correct for highly concave polygons but is probably good enough for
+        # use in a testing tool
+        xs = (coords[i] for i in [0...coords.length] by 2)
+        ys = (coords[i] for i in [1...coords.length] by 2)
+        minX = Math.min xs...
+        maxX = Math.max xs...
+        minY = Math.min ys...
+        maxY = Math.max ys...
+        { x: minX, y: minY, width: maxX-minX, height: maxY-minY }
+
+  _getAreaImage: ->
+    if 'area' == @tagName().toLowerCase()
+      map = @parent()
+      if map.tagName().toLowerCase() != 'map'
+        throw new Error('the area is not within a map')
+
+      mapName = map.getAttribute('name')
+      if not mapName?
+        throw new Error ("area's parent map must have a name")
+      mapName = '#' + mapName.toLowerCase()
+
+      image_node_id = @page.find('css', "img[usemap='#{mapName}']")[0]
+      if not image_node_id?
+        throw new Error ("no image matches the map")
+
+      @page.get(image_node_id)
+

data/lib/capybara/poltergeist/client/web_page.coffee

@@ -20,12 +20,14 @@ class Poltergeist.WebPage
     @source          = null
     @closed          = false
     @state           = 'default'
+    @urlWhitelist    = []
     @urlBlacklist    = []
     @frames          = []
     @errors          = []
     @_networkTraffic = {}
     @_tempHeaders    = {}
     @_blockedUrls    = []
+    @_requestedResources = {}
 
     for callback in WebPage.CALLBACKS
       this.bindCallback(callback)
@@ -61,6 +63,7 @@ class Poltergeist.WebPage
   onLoadStartedNative: ->
     @state = 'loading'
     @requestId = @lastRequestId
+    @_requestedResources = {}
 
   onLoadFinishedNative: (@status) ->
     @state = 'default'
@@ -78,9 +81,22 @@ class Poltergeist.WebPage
     return true
 
   onResourceRequestedNative: (request, net) ->
-    abort = @urlBlacklist.some (blacklisted_url) ->
+    useWhitelist = @urlWhitelist.length > 0
+
+    whitelisted = @urlWhitelist.some (whitelisted_url) ->
+      request.url.indexOf(whitelisted_url) != -1
+
+    blacklisted = @urlBlacklist.some (blacklisted_url) ->
       request.url.indexOf(blacklisted_url) != -1
 
+    abort = false
+
+    if useWhitelist && !whitelisted
+      abort = true
+
+    if blacklisted
+      abort = true
+
     if abort
       @_blockedUrls.push request.url unless request.url in @_blockedUrls
       net.abort()
@@ -96,11 +112,16 @@ class Poltergeist.WebPage
         responseParts: []
         error: null
       }
+
+      @_requestedResources[request.id] = request.url
     return true
 
   onResourceReceivedNative: (response) ->
     @_networkTraffic[response.id]?.responseParts.push(response)
 
+    if response.stage == 'end'
+      delete @_requestedResources[response.id]
+
     if @requestId == response.id
       if response.redirectURL
         @redirectURL = @normalizeURL(response.redirectURL)
@@ -111,6 +132,7 @@ class Poltergeist.WebPage
 
   onResourceErrorNative: (errorResponse) ->
     @_networkTraffic[errorResponse.id]?.error = errorResponse
+    delete @_requestedResources[errorResponse.id]
     return true
 
   injectAgent: ->
@@ -146,11 +168,25 @@ class Poltergeist.WebPage
     names.split(',').map (name) =>
       this.keyCode(name.charAt(0).toUpperCase() + name.substring(1))
 
-  waitState: (state, callback) ->
+  _waitState_until: (state, callback, timeout, timeout_callback) ->
+    if (@state == state)
+      callback.call()
+    else
+      d = new Date()
+      if d.getTime() > timeout
+        timeout_callback.call()
+      else
+        setTimeout (=> @_waitState_until(state, callback, timeout, timeout_callback)), 100
+
+  waitState: (state, callback, max_wait=0, timeout_callback) ->
     if @state == state
       callback.call()
     else
-      setTimeout (=> @waitState(state, callback)), 100
+      if max_wait != 0
+        timeout = (new Date).getTime() + (max_wait*1000)
+        setTimeout (=> @_waitState_until(state, callback, timeout, timeout_callback)), 100
+      else
+        setTimeout (=> @waitState(state, callback)), 100
 
   setHttpAuth: (user, password) ->
     this.native().settings.userName = user
@@ -171,6 +207,9 @@ class Poltergeist.WebPage
     @_blockedUrls = []
     return true
 
+  openResourceRequests: ->
+    url for own id, url of @_requestedResources
+
   content: ->
     this.native().frameContent
 

data/lib/capybara/poltergeist/command.rb

@@ -3,6 +3,8 @@ require 'securerandom'
 module Capybara::Poltergeist
   class Command
     attr_reader :id
+    attr_reader :name
+    attr_accessor :args
 
     def initialize(name, *args)
       @id = SecureRandom.uuid

data/lib/capybara/poltergeist/driver.rb

@@ -53,8 +53,8 @@ module Capybara::Poltergeist
       # PhantomJS defaults to only using SSLv3, which since POODLE (Oct 2014)
       # many sites have dropped from their supported protocols (eg PayPal,
       # Braintree).
-      list += ["--ssl-protocol=any"] unless list.grep(/ssl-protocol/).any?
-
+      list += ["--ignore-ssl-errors=yes"] unless list.grep(/ignore-ssl-errors/).any?
+      list += ["--ssl-protocol=TLSv1"] unless list.grep(/ssl-protocol/).any?
       list += ["--remote-debugger-port=#{inspector.port}", "--remote-debugger-autorun=yes"] if inspector
       list
     end

data/lib/capybara/poltergeist/errors.rb

@@ -60,8 +60,14 @@ module Capybara
         response['args'].first
       end
 
+      def details
+        response['args'][1]
+      end
+
       def message
-        "Request to '#{url}' failed to reach server, check DNS and/or server status"
+        msg = "Request to '#{url}' failed to reach server, check DNS and/or server status"
+        msg += " - #{details}" if details
+        msg
       end
     end
 

data/lib/capybara/poltergeist/node.rb

@@ -120,7 +120,7 @@ module Capybara::Poltergeist
     end
 
     def selected?
-      self[:selected]
+      !!self[:selected]
     end
 
     def disabled?

data/lib/capybara/poltergeist/server.rb

@@ -30,7 +30,12 @@ module Capybara::Poltergeist
     end
 
     def send(command)
-      @socket.send(command.id, command.message) or raise DeadClient.new(command.message)
+      receive_timeout = nil # default
+      if command.name == 'visit'
+        command.args.push(timeout) # set the client set visit timeout parameter
+        receive_timeout = timeout + 5 # Add a couple of seconds to let the client timeout first
+      end
+      @socket.send(command.id, command.message, receive_timeout) or raise DeadClient.new(command.message)
     end
   end
 end

data/lib/capybara/poltergeist/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Poltergeist
-    VERSION = "1.8.1"
+    VERSION = "1.9.0"
   end
 end

data/lib/capybara/poltergeist/web_socket_server.rb

@@ -68,14 +68,15 @@ module Capybara::Poltergeist
 
     # Block until the next message is available from the Web Socket.
     # Raises Errno::EWOULDBLOCK if timeout is reached.
-    def receive(cmd_id)
+    def receive(cmd_id, receive_timeout=nil)
+      receive_timeout ||= timeout
       start = Time.now
 
       until @messages.has_key?(cmd_id)
-        raise Errno::EWOULDBLOCK if (Time.now - start) >= timeout
+        raise Errno::EWOULDBLOCK if (Time.now - start) >= receive_timeout
         if @receive_mutex.try_lock
           begin
-            IO.select([socket], [], [], timeout) or raise Errno::EWOULDBLOCK
+            IO.select([socket], [], [], receive_timeout) or raise Errno::EWOULDBLOCK
             data = socket.recv(RECV_SIZE)
             break if data.empty?
             driver.parse(data)
@@ -90,10 +91,10 @@ module Capybara::Poltergeist
     end
 
     # Send a message and block until there is a response
-    def send(cmd_id, message)
+    def send(cmd_id, message, accept_timeout=nil)
       accept unless connected?
       driver.text(message)
-      receive(cmd_id)
+      receive(cmd_id, accept_timeout)
     rescue Errno::EWOULDBLOCK
       raise TimeoutError.new(message)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: PhantomJS driver for Capybara