poltergeist 1.14.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc319cb98595a9cedd482bffd3756720c4ed24b4
-  data.tar.gz: a79f76c1344f910aac1aa9f38a0cb6fd40dfa075
+  metadata.gz: 83bb04d3f05ad64c5a1b5b213d89acce146434b3
+  data.tar.gz: 6b566336fff00fff1f62fe1161e55beb45e713ce
 SHA512:
-  metadata.gz: f0c6a5e24513e4c34e755c2a4cee6191580648d98bea2ba26877b8d4267dafb75a6aedd0d61d49b767b02dd825cdbcbbd1a59d05a85fc35a3230aaf92eccadaa
-  data.tar.gz: c634a8ee97d076785499dd803553174d1ed5932cede4f80bdc23dc11a364cec694d024a8e51bf10cf0155948ddc9a38515d5f43fbc7d3c1590ace315a88d3169
+  metadata.gz: 159c3e618bd128c033e6746738e725b6e4f7cd2be5a9b7da53455c09c58c6f48d98a2eaf4dd0087b355a6259489d419be989bb6df89f5c7d86485a33c7217de2
+  data.tar.gz: bd0c8a67bf6e392e2aff5e5a6cc0e65d818c173e1879d8d6dc1ffc282d4bcc48374fcf6943ff30283e981d6398489125bd7151f7ecf1e8ced971c445ec108dfc

data/README.md

@@ -9,7 +9,7 @@ provided by [PhantomJS](http://phantomjs.org/).
 **If you're viewing this at https://github.com/teampoltergeist/poltergeist,
 you're reading the documentation for the master branch.
 [View documentation for the latest release
-(1.13.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.13.0)**
+(1.15.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.15.0)**
 
 ## Getting help ##
 
@@ -88,8 +88,9 @@ 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/), [CircleCI](https://circleci.com/)
-and [Codeship](https://codeship.com/) has PhantomJS pre-installed.
+[Travis CI](https://travis-ci.org/), [CircleCI](https://circleci.com/),
+[Codeship](https://codeship.com/) and [Semaphore](https://semaphoreci.com/)
+have 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
@@ -280,8 +281,8 @@ end
     to be passed to PhantomJS, e.g. `['--load-images=no', '--ignore-ssl-errors=yes']`
 *   `:extensions` (Array) - An array of JS files to be preloaded into
     the phantomjs browser. Useful for faking unsupported APIs.
-*   `:port` (Fixnum) - The port which should be used to communicate
-    with the PhantomJS process. Defaults to a random open port.
+*   `:port` (Fixnum) - The port which should be used to communicate with the PhantomJS process. Defaults to a random open port.
+*   `:host` (String) - The name or IP of the PhantomJS host. Default is '127.0.0.1'.
 *   `:url_blacklist` (Array) - Default session url blacklist - expressed as an array of strings to match against requested URLs.
 *   `:url_whitelist` (Array) - Default session url whitelist - expressed as an array of strings to match against requested URLs.
 

data/lib/capybara/poltergeist/browser.rb

@@ -11,7 +11,8 @@ module Capybara::Poltergeist
       'Poltergeist.InvalidSelector' => InvalidSelector,
       'Poltergeist.StatusFailError' => StatusFailError,
       'Poltergeist.NoSuchWindowError' => NoSuchWindowError,
-      'Poltergeist.UnsupportedFeature' => UnsupportedFeature
+      'Poltergeist.UnsupportedFeature' => UnsupportedFeature,
+      'Poltergeist.KeyError' => KeyError,
     }
 
     attr_reader :server, :client, :logger
@@ -442,15 +443,15 @@ module Capybara::Poltergeist
     }
 
     def normalize_keys(keys)
-      keys.map do |key|
-        case key
+      keys.map do |key_desc|
+        case key_desc
         when Array
-          # [:Shift, "s"] => { modifier: "shift", key: "S" }
-          # [:Shift, "string"] => { modifier: "shift", key: "STRING" }
-          # [:Ctrl, :Left] => { modifier: "ctrl", key: :Left }
-          # [:Ctrl, :Shift, :Left] => { modifier: "ctrl,shift", key: :Left }
+          # [:Shift, "s"] => { modifier: "shift", keys: "S" }
+          # [:Shift, "string"] => { modifier: "shift", keys: "STRING" }
+          # [:Ctrl, :Left] => { modifier: "ctrl", key: 'Left' }
+          # [:Ctrl, :Shift, :Left] => { modifier: "ctrl,shift", key: 'Left' }
           # [:Ctrl, :Left, :Left] => { modifier: "ctrl", key: [:Left, :Left] }
-          _keys = key.chunk {|k| k.is_a?(Symbol) && %w(shift ctrl control alt meta command).include?(k.to_s.downcase) }
+          _keys = key_desc.chunk {|k| k.is_a?(Symbol) && %w(shift ctrl control alt meta command).include?(k.to_s.downcase) }
           modifiers = if _keys.peek[0]
             _keys.next[1].map do |k|
               k = k.to_s.downcase
@@ -461,19 +462,19 @@ module Capybara::Poltergeist
           else
             ''
           end
-          letter = normalize_keys(_keys.next[1].map {|k| k.is_a?(String) ? k.upcase : k })
-          { modifier: modifiers, key: letter }
+          letters = normalize_keys(_keys.next[1].map {|k| k.is_a?(String) ? k.upcase : k })
+          { modifier: modifiers, keys: letters }
         when Symbol
           # Return a known sequence for PhantomJS
-          key = KEY_ALIASES.fetch(key, key)
+          key = KEY_ALIASES.fetch(key_desc, key_desc)
           if match = key.to_s.match(/numpad(.)/)
-            res = { key: match[1], modifier: 'keypad' }
+            res = { keys: match[1], modifier: 'keypad' }
           elsif key !~ /^[A-Z]/
-            key = key.to_s.split('_').map{|e| e.capitalize}.join
+            key = key.to_s.split('_').map{ |e| e.capitalize }.join
           end
           res || { key: key }
         when String
-          key # Plain string, nothing to do
+          key_desc # Plain string, nothing to do
         end
       end
     end

data/lib/capybara/poltergeist/client.rb

@@ -64,6 +64,7 @@ module Capybara::Poltergeist
 
       process_options = {}
       process_options[:pgroup] = true unless Capybara::Poltergeist.windows?
+      process_options[:out] = @write_io if Capybara::Poltergeist.mri?
 
       redirect_stdout do
         @pid = Process.spawn(*command.map(&:to_s), process_options)
@@ -91,6 +92,7 @@ module Capybara::Poltergeist
       parts << PHANTOMJS_SCRIPT
       parts << server.port
       parts.concat window_size
+      parts << server.host
       parts
     end
 
@@ -102,14 +104,20 @@ module Capybara::Poltergeist
     # lose all the output from child. Process.popen can be used here and seems
     # it works with JRuby but I've experienced strange mistakes on Rubinius.
     def redirect_stdout
-      prev = STDOUT.dup
-      $stdout = @write_io
-      STDOUT.reopen(@write_io)
-      yield
-    ensure
-      STDOUT.reopen(prev)
-      $stdout = STDOUT
-      prev.close
+      if Capybara::Poltergeist.mri?
+        yield
+      else
+        begin
+          prev = STDOUT.dup
+          $stdout = @write_io
+          STDOUT.reopen(@write_io)
+          yield
+        ensure
+          STDOUT.reopen(prev)
+          $stdout = STDOUT
+          prev.close
+        end
+      end
     end
 
     def kill_phantomjs

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

@@ -117,6 +117,8 @@ class Poltergeist.Browser
         resources = @openResourceRequests()
         msg = if resources.length
           "Timed out with the following resources still waiting #{resources.join(',')}"
+        else
+          "Timed out with no open resource requests"
         command.sendError(new Poltergeist.StatusFailError(url,msg))
       return
 
@@ -356,10 +358,14 @@ class Poltergeist.Browser
 
   _send_keys_with_modifiers: (keys, current_modifier_code = 0) ->
     for sequence in keys
-      key = if sequence.key?
-        @currentPage.keyCode(sequence.key) || sequence.key
+      if sequence.key?
+        if !(key=@currentPage.keyCode(sequence.key))
+          @current_command.sendError(new Poltergeist.KeyError("Unknown key: #{sequence.key}"))
+          return
+      else if sequence.keys?
+        key=sequence.keys
       else
-        sequence
+        key=sequence
 
       if sequence.modifier?
         modifier_keys = @currentPage.keyModifierKeys(sequence.modifier)
@@ -369,6 +375,7 @@ class Poltergeist.Browser
         @currentPage.sendEvent('keyup', modifier_key) for modifier_key in modifier_keys
       else
         @currentPage.sendEvent('keypress', key, null, null, current_modifier_code)
+    return true
 
   render_base64: (format, { full = false, selector = null } = {})->
     window_scroll_position = @currentPage.native().evaluate("function(){ return [window.pageXOffset, window.pageYOffset] }")
@@ -498,24 +505,20 @@ class Poltergeist.Browser
     throw new Error('zomg')
 
   go_back: ->
-    command = @current_command
     if @currentPage.canGoBack
-      @currentPage.state = 'loading'
+      @currentPage.state = 'wait_for_loading'
       @currentPage.goBack()
-      @currentPage.waitState 'default', ->
-        command.sendResponse(true)
+      @_waitForHistoryChange()
     else
-      command.sendResponse(false)
+      @current_command.sendResponse(false)
 
   go_forward: ->
-    command = @current_command
     if @currentPage.canGoForward
-      @currentPage.state = 'loading'
+      @currentPage.state = 'wait_for_loading'
       @currentPage.goForward()
-      @currentPage.waitState 'default', ->
-        command.sendResponse(true)
+      @_waitForHistoryChange()
     else
-      command.sendResponse(false)
+      @current_command.sendResponse(false)
 
   set_url_whitelist: (wildcards...)->
     @currentPage.urlWhitelist = (@_wildcardToRegexp(wc) for wc in wildcards)
@@ -540,6 +543,21 @@ class Poltergeist.Browser
     @currentPage.clearMemoryCache()
     @current_command.sendResponse(true)
 
+  _waitForHistoryChange: ->
+    command = @current_command
+    @currentPage.waitState ['loading','default'], (cur_state) ->
+      if cur_state == 'loading'
+        # loading has started, wait for completion
+        @waitState 'default', ->
+          command.sendResponse(true)
+      else
+        # page has loaded
+        command.sendResponse(true)
+    , 0.5, ->
+      # if haven't moved to loading/default in time assume history API state change
+      @state = 'default'
+      command.sendResponse(true)
+
   _wildcardToRegexp: (wildcard)->
     wildcard = wildcard.replace(/[\-\[\]\/\{\}\(\)\+\.\\\^\$\|]/g, "\\$&")
     wildcard = wildcard.replace(/\*/g, ".*")

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

@@ -2,18 +2,20 @@ class Poltergeist.Cmd
   constructor: (@owner, @id, @name, @args)->
     @_response_sent = false
   sendResponse: (response) ->
-    errors = @browser.currentPage.errors
-    @browser.currentPage.clearErrors()
+    if !@_response_sent
+      errors = @browser.currentPage.errors
+      @browser.currentPage.clearErrors()
 
-    if errors.length > 0 && @browser.js_errors
-      @sendError(new Poltergeist.JavascriptError(errors))
-    else
-      @owner.sendResponse(@id, response) unless @_response_sent
-      @_response_sent = true
+      if errors.length > 0 && @browser.js_errors
+        @sendError(new Poltergeist.JavascriptError(errors))
+      else
+        @owner.sendResponse(@id, response)
+        @_response_sent = true
 
   sendError: (errors) ->
-    @owner.sendError(@id, errors) unless @_response_sent
-    @_response_sent = true
+    if !@_response_sent
+      @owner.sendError(@id, errors)
+      @_response_sent = true
 
   run: (@browser) ->
     try

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

@@ -145,7 +145,7 @@ Poltergeist.Browser = (function() {
       }, max_wait, function() {
         var msg, resources;
         resources = this.openResourceRequests();
-        msg = resources.length ? "Timed out with the following resources still waiting " + (resources.join(',')) : void 0;
+        msg = resources.length ? "Timed out with the following resources still waiting " + (resources.join(',')) : "Timed out with no open resource requests";
         return command.sendError(new Poltergeist.StatusFailError(url, msg));
       });
     }
@@ -483,14 +483,22 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype._send_keys_with_modifiers = function(keys, current_modifier_code) {
-    var i, j, key, len, len1, modifier_code, modifier_key, modifier_keys, results, sequence;
+    var i, j, k, key, len, len1, len2, modifier_code, modifier_key, modifier_keys, sequence;
     if (current_modifier_code == null) {
       current_modifier_code = 0;
     }
-    results = [];
     for (i = 0, len = keys.length; i < len; i++) {
       sequence = keys[i];
-      key = sequence.key != null ? this.currentPage.keyCode(sequence.key) || sequence.key : sequence;
+      if (sequence.key != null) {
+        if (!(key = this.currentPage.keyCode(sequence.key))) {
+          this.current_command.sendError(new Poltergeist.KeyError("Unknown key: " + sequence.key));
+          return;
+        }
+      } else if (sequence.keys != null) {
+        key = sequence.keys;
+      } else {
+        key = sequence;
+      }
       if (sequence.modifier != null) {
         modifier_keys = this.currentPage.keyModifierKeys(sequence.modifier);
         modifier_code = this.currentPage.keyModifierCode(sequence.modifier) | current_modifier_code;
@@ -499,20 +507,15 @@ Poltergeist.Browser = (function() {
           this.currentPage.sendEvent('keydown', modifier_key);
         }
         this._send_keys_with_modifiers([].concat(key), modifier_code);
-        results.push((function() {
-          var k, len2, results1;
-          results1 = [];
-          for (k = 0, len2 = modifier_keys.length; k < len2; k++) {
-            modifier_key = modifier_keys[k];
-            results1.push(this.currentPage.sendEvent('keyup', modifier_key));
-          }
-          return results1;
-        }).call(this));
+        for (k = 0, len2 = modifier_keys.length; k < len2; k++) {
+          modifier_key = modifier_keys[k];
+          this.currentPage.sendEvent('keyup', modifier_key);
+        }
       } else {
-        results.push(this.currentPage.sendEvent('keypress', key, null, null, current_modifier_code));
+        this.currentPage.sendEvent('keypress', key, null, null, current_modifier_code);
       }
     }
-    return results;
+    return true;
   };
 
   Browser.prototype.render_base64 = function(format, arg1) {
@@ -693,30 +696,22 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.go_back = function() {
-    var command;
-    command = this.current_command;
     if (this.currentPage.canGoBack) {
-      this.currentPage.state = 'loading';
+      this.currentPage.state = 'wait_for_loading';
       this.currentPage.goBack();
-      return this.currentPage.waitState('default', function() {
-        return command.sendResponse(true);
-      });
+      return this._waitForHistoryChange();
     } else {
-      return command.sendResponse(false);
+      return this.current_command.sendResponse(false);
     }
   };
 
   Browser.prototype.go_forward = function() {
-    var command;
-    command = this.current_command;
     if (this.currentPage.canGoForward) {
-      this.currentPage.state = 'loading';
+      this.currentPage.state = 'wait_for_loading';
       this.currentPage.goForward();
-      return this.currentPage.waitState('default', function() {
-        return command.sendResponse(true);
-      });
+      return this._waitForHistoryChange();
     } else {
-      return command.sendResponse(false);
+      return this.current_command.sendResponse(false);
     }
   };
 
@@ -769,6 +764,23 @@ Poltergeist.Browser = (function() {
     return this.current_command.sendResponse(true);
   };
 
+  Browser.prototype._waitForHistoryChange = function() {
+    var command;
+    command = this.current_command;
+    return this.currentPage.waitState(['loading', 'default'], function(cur_state) {
+      if (cur_state === 'loading') {
+        return this.waitState('default', function() {
+          return command.sendResponse(true);
+        });
+      } else {
+        return command.sendResponse(true);
+      }
+    }, 0.5, function() {
+      this.state = 'default';
+      return command.sendResponse(true);
+    });
+  };
+
   Browser.prototype._wildcardToRegexp = function(wildcard) {
     wildcard = wildcard.replace(/[\-\[\]\/\{\}\(\)\+\.\\\^\$\|]/g, "\\$&");
     wildcard = wildcard.replace(/\*/g, ".*");

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

@@ -9,23 +9,23 @@ Poltergeist.Cmd = (function() {
 
   Cmd.prototype.sendResponse = function(response) {
     var errors;
-    errors = this.browser.currentPage.errors;
-    this.browser.currentPage.clearErrors();
-    if (errors.length > 0 && this.browser.js_errors) {
-      return this.sendError(new Poltergeist.JavascriptError(errors));
-    } else {
-      if (!this._response_sent) {
+    if (!this._response_sent) {
+      errors = this.browser.currentPage.errors;
+      this.browser.currentPage.clearErrors();
+      if (errors.length > 0 && this.browser.js_errors) {
+        return this.sendError(new Poltergeist.JavascriptError(errors));
+      } else {
         this.owner.sendResponse(this.id, response);
+        return this._response_sent = true;
       }
-      return this._response_sent = true;
     }
   };
 
   Cmd.prototype.sendError = function(errors) {
     if (!this._response_sent) {
       this.owner.sendError(this.id, errors);
+      return this._response_sent = true;
     }
-    return this._response_sent = true;
   };
 
   Cmd.prototype.run = function(browser) {

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

@@ -1,11 +1,12 @@
 var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
 
 Poltergeist.Connection = (function() {
-  function Connection(owner, port) {
+  function Connection(owner, port, host) {
     this.owner = owner;
     this.port = port;
+    this.host = host != null ? host : "127.0.0.1";
     this.commandReceived = bind(this.commandReceived, this);
-    this.socket = new WebSocket("ws://127.0.0.1:" + this.port + "/");
+    this.socket = new WebSocket("ws://" + this.host + ":" + this.port + "/");
     this.socket.onmessage = this.commandReceived;
     this.socket.onclose = function() {
       return phantom.exit();

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

@@ -3,9 +3,9 @@ var Poltergeist, system,
   hasProp = {}.hasOwnProperty;
 
 Poltergeist = (function() {
-  function Poltergeist(port, width, height) {
+  function Poltergeist(port, width, height, host) {
     this.browser = new Poltergeist.Browser(width, height);
-    this.connection = new Poltergeist.Connection(this, port);
+    this.connection = new Poltergeist.Connection(this, port, host);
     phantom.onError = (function(_this) {
       return function(message, stack) {
         return _this.onError(message, stack);
@@ -127,6 +127,23 @@ Poltergeist.MouseEventFailed = (function(superClass) {
 
 })(Poltergeist.Error);
 
+Poltergeist.KeyError = (function(superClass) {
+  extend(KeyError, superClass);
+
+  function KeyError(message1) {
+    this.message = message1;
+  }
+
+  KeyError.prototype.name = "Poltergeist.KeyError";
+
+  KeyError.prototype.args = function() {
+    return [this.message];
+  };
+
+  return KeyError;
+
+})(Poltergeist.Error);
+
 Poltergeist.JavascriptError = (function(superClass) {
   extend(JavascriptError, superClass);
 
@@ -226,4 +243,4 @@ phantom.injectJs(phantom.libraryPath + "/browser.js");
 
 system = require('system');
 
-new Poltergeist(system.args[1], system.args[2], system.args[3]);
+new Poltergeist(system.args[1], system.args[2], system.args[3], system.args[4]);

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

@@ -238,41 +238,43 @@ Poltergeist.WebPage = (function() {
     return results;
   };
 
-  WebPage.prototype._waitState_until = function(state, callback, timeout, timeout_callback) {
-    if (this.state === state) {
-      return callback.call(this);
+  WebPage.prototype._waitState_until = function(states, callback, timeout, timeout_callback) {
+    var ref2;
+    if ((ref2 = this.state, indexOf.call(states, ref2) >= 0)) {
+      return callback.call(this, this.state);
     } else {
       if (new Date().getTime() > timeout) {
         return timeout_callback.call(this);
       } else {
         return setTimeout(((function(_this) {
           return function() {
-            return _this._waitState_until(state, callback, timeout, timeout_callback);
+            return _this._waitState_until(states, callback, timeout, timeout_callback);
           };
         })(this)), 100);
       }
     }
   };
 
-  WebPage.prototype.waitState = function(state, callback, max_wait, timeout_callback) {
-    var timeout;
+  WebPage.prototype.waitState = function(states, callback, max_wait, timeout_callback) {
+    var ref2, timeout;
     if (max_wait == null) {
       max_wait = 0;
     }
-    if (this.state === state) {
-      return callback.call(this);
+    states = [].concat(states);
+    if (ref2 = this.state, indexOf.call(states, ref2) >= 0) {
+      return callback.call(this, this.state);
     } else {
       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);
+            return _this._waitState_until(states, callback, timeout, timeout_callback);
           };
         })(this)), 100);
       } else {
         return setTimeout(((function(_this) {
           return function() {
-            return _this.waitState(state, callback);
+            return _this.waitState(states, callback);
           };
         })(this)), 100);
       }

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

@@ -1,6 +1,6 @@
 class Poltergeist.Connection
-  constructor: (@owner, @port) ->
-    @socket = new WebSocket "ws://127.0.0.1:#{@port}/"
+  constructor: (@owner, @port, @host = "127.0.0.1") ->
+    @socket = new WebSocket "ws://#{@host}:#{@port}/"
     @socket.onmessage = this.commandReceived
     @socket.onclose = -> phantom.exit()
 

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

@@ -1,7 +1,7 @@
 class Poltergeist
-  constructor: (port, width, height) ->
+  constructor: (port, width, height, host) ->
     @browser    = new Poltergeist.Browser(width, height)
-    @connection = new Poltergeist.Connection(this, port)
+    @connection = new Poltergeist.Connection(this, port, host)
 
     phantom.onError = (message, stack) => @onError(message, stack)
 
@@ -50,6 +50,11 @@ class Poltergeist.MouseEventFailed extends Poltergeist.Error
   name: "Poltergeist.MouseEventFailed"
   args: -> [@eventName, @selector, @position]
 
+class Poltergeist.KeyError extends Poltergeist.Error
+  constructor: (@message) ->
+  name: "Poltergeist.KeyError"
+  args: -> [@message]
+
 class Poltergeist.JavascriptError extends Poltergeist.Error
   constructor: (@errors) ->
   name: "Poltergeist.JavascriptError"
@@ -83,4 +88,4 @@ phantom.injectJs("#{phantom.libraryPath}/cmd.js")
 phantom.injectJs("#{phantom.libraryPath}/browser.js")
 
 system = require 'system'
-new Poltergeist(system.args[1], system.args[2], system.args[3])
+new Poltergeist(system.args[1], system.args[2], system.args[3], system.args[4])

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

@@ -162,25 +162,26 @@ class Poltergeist.WebPage
       name = name.charAt(0).toUpperCase() + name.substring(1)
       this.keyCode(name)
 
-  _waitState_until: (state, callback, timeout, timeout_callback) ->
-    if (@state == state)
-      callback.call(this)
+  _waitState_until: (states, callback, timeout, timeout_callback) ->
+    if (@state in states)
+      callback.call(this, @state)
     else
       if new Date().getTime() > timeout
         timeout_callback.call(this)
       else
-        setTimeout (=> @_waitState_until(state, callback, timeout, timeout_callback)), 100
+        setTimeout (=> @_waitState_until(states, callback, timeout, timeout_callback)), 100
 
-  waitState: (state, callback, max_wait=0, timeout_callback) ->
+  waitState: (states, callback, max_wait=0, timeout_callback) ->
     # callback and timeout_callback will be called with this == the current page
-    if @state == state
-      callback.call(this)
+    states = [].concat(states)
+    if @state in states
+      callback.call(this, @state)
     else
       if max_wait != 0
         timeout = new Date().getTime() + (max_wait*1000)
-        setTimeout (=> @_waitState_until(state, callback, timeout, timeout_callback)), 100
+        setTimeout (=> @_waitState_until(states, callback, timeout, timeout_callback)), 100
       else
-        setTimeout (=> @waitState(state, callback)), 100
+        setTimeout (=> @waitState(states, callback)), 100
 
   setHttpAuth: (user, password) ->
     this.native().settings.userName = user

data/lib/capybara/poltergeist/driver.rb

@@ -37,7 +37,7 @@ module Capybara::Poltergeist
     end
 
     def server
-      @server ||= Server.new(options[:port], options.fetch(:timeout) { DEFAULT_TIMEOUT })
+      @server ||= Server.new(options[:port], options.fetch(:timeout) { DEFAULT_TIMEOUT }, options[:host])
     end
 
     def client
@@ -272,7 +272,7 @@ module Capybara::Poltergeist
         if @started
           URI.parse(browser.current_url).host
         else
-          URI.parse(Capybara.app_host || '').host || "127.0.0.1"
+          URI.parse(default_cookie_host).host || "127.0.0.1"
         end
       end
 
@@ -394,7 +394,7 @@ module Capybara::Poltergeist
 
     def find_modal(options)
       start_time    = Time.now
-      timeout_sec   = options[:wait] || begin Capybara.default_max_wait_time rescue Capybara.default_wait_time end
+      timeout_sec   = options.fetch(:wait) { session_wait_time }
       expect_text   = options[:text]
       expect_regexp = expect_text.is_a?(Regexp) ? expect_text : Regexp.escape(expect_text.to_s)
       not_found_msg = 'Unable to find modal dialog'
@@ -411,6 +411,22 @@ module Capybara::Poltergeist
       modal_text
     end
 
+    def session_wait_time
+      if respond_to?(:session_options)
+        session_options.default_max_wait_time
+      else
+        begin Capybara.default_max_wait_time rescue Capybara.default_wait_time end
+      end
+    end
+
+    def default_cookie_host
+      if respond_to?(:session_options)
+        session_options.app_host
+      else
+        Capybara.app_host
+      end || ''
+    end
+
     def unwrap_script_result(arg)
       case arg
       when Array

data/lib/capybara/poltergeist/errors.rb

@@ -154,6 +154,12 @@ module Capybara
       end
     end
 
+    class KeyError < ::ArgumentError
+      def initialize(response)
+        super(response["args"].first)
+      end
+    end
+
     class TimeoutError < Error
       def initialize(message)
         @message = message

data/lib/capybara/poltergeist/server.rb

@@ -1,10 +1,11 @@
 module Capybara::Poltergeist
   class Server
-    attr_reader :socket, :fixed_port, :timeout
+    attr_reader :socket, :fixed_port, :timeout, :custom_host
 
-    def initialize(fixed_port = nil, timeout = nil)
+    def initialize(fixed_port = nil, timeout = nil, custom_host = nil)
       @fixed_port = fixed_port
       @timeout    = timeout
+      @custom_host = custom_host
       start
     end
 
@@ -12,12 +13,16 @@ module Capybara::Poltergeist
       @socket.port
     end
 
+    def host
+      @socket.host
+    end
+
     def timeout=(sec)
       @timeout = @socket.timeout = sec
     end
 
     def start
-      @socket = WebSocketServer.new(fixed_port, timeout)
+      @socket = WebSocketServer.new(fixed_port, timeout, custom_host)
     end
 
     def stop

data/lib/capybara/poltergeist/utility.rb

@@ -1,9 +1,13 @@
-module Capybara
-  module Poltergeist
-    class << self
-      def windows?
-        RbConfig::CONFIG["host_os"] =~ /mingw|mswin|cygwin/
-      end
-    end
-  end
-end
+module Capybara
+  module Poltergeist
+    class << self
+      def windows?
+        RbConfig::CONFIG["host_os"] =~ /mingw|mswin|cygwin/
+      end
+
+      def mri?
+        defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby"
+      end
+    end
+  end
+end

data/lib/capybara/poltergeist/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Poltergeist
-    VERSION = "1.14.0"
+    VERSION = "1.15.0"
   end
 end

data/lib/capybara/poltergeist/web_socket_server.rb

@@ -18,21 +18,22 @@ module Capybara::Poltergeist
 
     HOST = '127.0.0.1'
 
-    attr_reader :port, :driver, :socket, :server
+    attr_reader :port, :driver, :socket, :server, :host
     attr_accessor :timeout
 
-    def initialize(port = nil, timeout = nil)
+    def initialize(port = nil, timeout = nil, custom_host = nil)
       @timeout = timeout
-      @server  = start_server(port)
+      @server  = start_server(port, custom_host)
       @receive_mutex = Mutex.new
     end
 
-    def start_server(port)
+    def start_server(port, custom_host)
       time = Time.now
 
       begin
-        TCPServer.open(HOST, port || 0).tap do |server|
+        TCPServer.open(custom_host || HOST, port || 0).tap do |server|
           @port = server.addr[1]
+          @host = server.addr[2]
         end
       rescue Errno::EADDRINUSE
         if (Time.now - time) < BIND_TIMEOUT

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -199,7 +199,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.6
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: erubi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -273,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: PhantomJS driver for Capybara