poltergeist 1.17.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06e484be00352d4b5c8134794b51783cd4358f6c8888ae35a4a0b396e33dd023
-  data.tar.gz: 1dd2652dac23268d7ef3de4d30f0222e9c720491f1a3d4b83a37dc7aa0b07982
+  metadata.gz: b7f5bf350711720abecb06c20bab6cea6489844fc3cd60b89a19d89c64723b02
+  data.tar.gz: 10b8c208d718baecf0515a7e3add9d185f522e04ad62773c41dd562de8a8817f
 SHA512:
-  metadata.gz: aa6b9d400580c3b99fe73523f330a1a222c30dd2679c376bbdf4a722e966dfef8367983657c68868ef67b0650928109881d7b3d4fb0dbdacc71aca8ab5f6e43f
-  data.tar.gz: feb9e85896493c42f85332cdae4ad2ac570489069b7fefc9ec9c3d40efb4db94fbfe185f23163bf5512113fdeefeab67386ee238c32ff0082b951a50628ff39a
+  metadata.gz: 18313bbc53ca8455008626bb7d521ad1cdd3f66daefad18b859a2a4a2132e38b4f306f46bc8e4a5c8bb80bd2232b3e7693653d3d7be12d86c7470ec01319d63c
+  data.tar.gz: bc7d1dd21d97d69b2902e77a4cf175be3fbec635650d5879e240fe29ec90511e96200cced21dbc225d82babd8154aaa47b60653cc75b813a1692893c13bbca31

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.17.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.17.0)**
+(1.18.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.18.0)**
 
 ## Getting help ##
 
@@ -207,6 +207,10 @@ This way your temporary headers will be sent only for the initial request, and r
 subsequent request will only contain your permanent headers. If the temporary
 headers should not be sent on related 30x redirects, specify `permanent: :no_redirect`.
 
+Headers set with any of these methods will be set within all windows in the
+session, with the exception of temporary headers, which are only set within the
+current window.
+
 ### Inspecting network traffic ###
 
 You can inspect the network traffic (i.e. what resources have been
@@ -294,6 +298,7 @@ end
 *   `: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.
+*   `:page_settings` (Hash) - PhantomJS web page settings (http://phantomjs.org/api/webpage/property/settings.html).
 
 ### URL Blacklisting & Whitelisting ###
 Poltergeist supports URL blacklisting, which allows you

data/lib/capybara/poltergeist/browser.rb

@@ -43,6 +43,10 @@ module Capybara::Poltergeist
       command 'current_url'
     end
 
+    def frame_url
+      command 'frame_url'
+    end
+
     def status_code
       command 'status_code'
     end
@@ -59,6 +63,10 @@ module Capybara::Poltergeist
       command 'title'
     end
 
+    def frame_title
+      command 'frame_title'
+    end
+
     def parents(page_id, id)
       command 'parents', page_id, id
     end
@@ -196,16 +204,16 @@ module Capybara::Poltergeist
       switch_to_window(original)
     end
 
-    def click(page_id, id)
-      command 'click', page_id, id
+    def click(page_id, id, keys=[], offset={})
+      command 'click', page_id, id, keys, offset
     end
 
-    def right_click(page_id, id)
-      command 'right_click', page_id, id
+    def right_click(page_id, id, keys=[], offset={})
+      command 'right_click', page_id, id, keys, offset
     end
 
-    def double_click(page_id, id)
-      command 'double_click', page_id, id
+    def double_click(page_id, id, keys=[], offset={})
+      command 'double_click', page_id, id, keys, offset
     end
 
     def hover(page_id, id)
@@ -346,6 +354,10 @@ module Capybara::Poltergeist
       command 'set_js_errors', !!val
     end
 
+    def page_settings=(settings)
+      command 'set_page_settings', settings
+    end
+
     def extensions=(names)
       @extensions = names
       Array(names).each do |name|

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

@@ -13,8 +13,8 @@ class PoltergeistAgent
   # Somehow PhantomJS returns all characters(brackets, etc) properly encoded
   # except whitespace character in pathname part of the location. This hack
   # is intended to fix this up.
-  currentUrl: ->
-    window.location.href.replace(/\ /g, '%20')
+  frameUrl: ->
+    window.location.href
 
   find: (method, selector, within = document) ->
     try
@@ -55,7 +55,9 @@ class PoltergeistAgent
     this.get(id).removeAttribute('_poltergeist_selected')
 
   clearLocalStorage: ->
-    localStorage?.clear()
+    try
+      localStorage?.clear()
+    catch error
 
   wrapResults: (result, page_id)->
     @_visitedObjects ||= [];
@@ -250,12 +252,12 @@ class PoltergeistAgent.Node
     else if value == false && !@element.parentNode.multiple
       false
     else
-      this.trigger('focus', @element.parentNode)
+      this.trigger('focus', {}, @element.parentNode)
 
       @element.selected = value
       this.changed()
 
-      this.trigger('blur', @element.parentNode)
+      this.trigger('blur', {}, @element.parentNode)
       true
 
   tagName: ->
@@ -326,7 +328,7 @@ class PoltergeistAgent.Node
     offset
 
   position: ->
-    # Elements inside an SVG return underfined for getClientRects???
+    # Elements inside an SVG return undefined for getClientRects???
     rect = @element.getClientRects()[0] || @element.getBoundingClientRect()
     throw new PoltergeistAgent.ObsoleteNode unless rect
     frameOffset = this.frameOffset()
@@ -342,12 +344,18 @@ class PoltergeistAgent.Node
 
     pos
 
-  trigger: (name, element = @element) ->
+  trigger: (name, options = {}, element = @element) ->
     if Node.EVENTS.MOUSE.indexOf(name) != -1
       event = document.createEvent('MouseEvent')
       event.initMouseEvent(
-        name, true, true, window, 0, 0, 0, 0, 0,
-        false, false, false, false, 0, null
+        name, true, true, window, 0,
+        options['screenX'] || 0, options['screenY'] || 0,
+        options['clientX'] || 0, options['clientY'] || 0,
+        options['ctrlKey'] || false,
+        options['altKey'] || false,
+        options['shiftKey'] || false,
+        options['metaKey'] || false,
+        options['button'] || 0, null
       )
     else if Node.EVENTS.FOCUS.indexOf(name) != -1
       event = this.obtainEvent(name)
@@ -437,3 +445,4 @@ document.addEventListener(
   'DOMContentLoaded',
   -> console.log('__DOMContentLoaded')
 )
+console.log('__DOMContentLoaded') if document.readyState == 'complete'

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

@@ -6,6 +6,7 @@ class Poltergeist.Browser
     @js_errors  = true
     @_debug     = false
     @_counter   = 0
+    @_page_settings = null
 
     @processed_modal_messages = []
     @confirm_processes = []
@@ -18,11 +19,11 @@ class Poltergeist.Browser
 
     if @page?
       unless @page.closed
-        @page.clearLocalStorage() if @page.currentUrl() != 'about:blank'
+        @page.clearLocalStorage() if @page.frameUrl() != 'about:blank'
         @page.close()
       phantom.clearCookies()
 
-    @page = @currentPage = new Poltergeist.WebPage
+    @page = @currentPage = new Poltergeist.WebPage(null, @_page_settings)
     @page.setViewportSize(width: @width, height: @height)
     @page.handle = "#{@_counter++}"
     @pages.push(@page)
@@ -54,11 +55,13 @@ class Poltergeist.Browser
       return response
 
     page.onPageCreated = (newPage) =>
-      _page = new Poltergeist.WebPage(newPage)
+      _page = new Poltergeist.WebPage(newPage, @_page_settings)
       _page.handle = "#{@_counter++}"
       _page.urlBlacklist = page.urlBlacklist
       _page.urlWhitelist = page.urlWhitelist
       _page.setViewportSize(page.viewportSize())
+      _page.setUserAgent(page.getUserAgent())
+      _page.setCustomHeaders(page.getPermanentCustomHeaders())
       @setupPageHandlers(_page)
       @pages.push(_page)
 
@@ -98,11 +101,10 @@ class Poltergeist.Browser
     @confirm_processes = []
     @prompt_responses = []
 
-
     # Prevent firing `page.onInitialized` event twice. Calling currentUrl
     # method before page is actually opened fires this event for the first time.
     # The second time will be in the right place after `page.open`
-    prevUrl = if @currentPage.source is null then 'about:blank' else @currentPage.currentUrl()
+    prevUrl = if @currentPage.source? then @currentPage.currentUrl() else 'about:blank'
 
     @currentPage.open(url)
 
@@ -130,6 +132,9 @@ class Poltergeist.Browser
   current_url: ->
     @current_command.sendResponse @currentPage.currentUrl()
 
+  frame_url: ->
+    @current_command.sendResponse @currentPage.frameUrl()
+
   status_code: ->
     @current_command.sendResponse @currentPage.statusCode
 
@@ -142,6 +147,9 @@ class Poltergeist.Browser
   title: ->
     @current_command.sendResponse @currentPage.title()
 
+  frame_title: ->
+    @current_command.sendResponse @currentPage.frameTitle()
+
   find: (method, selector) ->
     @current_command.sendResponse(page_id: @currentPage.id, ids: @currentPage.find(method, selector))
 
@@ -231,8 +239,8 @@ class Poltergeist.Browser
     @currentPage.execute("function() { #{script} }", args...)
     @current_command.sendResponse(true)
 
-  frameUrl: (frame_name) ->
-    @currentPage.frameUrl(frame_name)
+  frameUrlFor: (frame_name) ->
+    @currentPage.frameUrlFor(frame_name)
 
   pushFrame: (command, name, timeout) ->
     if Array.isArray(name)
@@ -242,11 +250,12 @@ class Poltergeist.Browser
         frame.setAttribute('name', "_random_name_#{new Date().getTime()}")
         name = frame.getAttribute('name')
 
-    frame_url = @frameUrl(name)
+    frame_url = @frameUrlFor(name)
     if frame_url in @currentPage.blockedUrls()
       command.sendResponse(true)
     else if @currentPage.pushFrame(name)
-      if frame_url && (frame_url != 'about:blank') && (@currentPage.currentUrl() == 'about:blank')
+      # if frame_url && (frame_url != 'about:blank') && (@currentPage.currentUrl() == 'about:blank')
+      if frame_url && (frame_url != 'about:blank') && (@currentPage.frameUrl() == 'about:blank')
         @currentPage.state = 'awaiting_frame_load'
         @currentPage.waitState 'default', ->
           command.sendResponse(true)
@@ -302,14 +311,14 @@ class Poltergeist.Browser
     else
       @current_command.sendResponse(false)
 
-  mouse_event: (page_id, id, name) ->
+  mouse_event: (page_id, id, name, keys=[], offset={}) ->
     # Get the node before changing state, in case there is an exception
     node = this.node(page_id, id)
     # If the event triggers onNavigationRequested, we will transition to the 'loading'
     # state and wait for onLoadFinished before sending a response.
     @currentPage.state = 'mouse_event'
 
-    last_mouse_event = node.mouseEvent(name)
+    last_mouse_event = node.mouseEvent(name, keys, offset)
     event_page = @currentPage
     command = @current_command
 
@@ -323,14 +332,14 @@ class Poltergeist.Browser
           command.sendResponse(position: last_mouse_event)
     , 5
 
-  click: (page_id, id) ->
-    this.mouse_event page_id, id, 'click'
+  click: (page_id, id, keys, offset) ->
+    this.mouse_event page_id, id, 'click', keys, offset
 
-  right_click: (page_id, id) ->
-    this.mouse_event page_id, id, 'rightclick'
+  right_click: (page_id, id, keys, offset) ->
+    this.mouse_event page_id, id, 'rightclick', keys, offset
 
-  double_click: (page_id, id) ->
-    this.mouse_event page_id, id, 'doubleclick'
+  double_click: (page_id, id, keys, offset) ->
+    this.mouse_event page_id, id, 'doubleclick', keys, offset
 
   hover: (page_id, id) ->
     this.mouse_event page_id, id, 'mousemove'
@@ -458,22 +467,23 @@ class Poltergeist.Browser
     @current_command.sendResponse(@currentPage.getCustomHeaders())
 
   set_headers: (headers) ->
-    # Workaround for https://code.google.com/p/phantomjs/issues/detail?id=745
-    @currentPage.setUserAgent(headers['User-Agent']) if headers['User-Agent']
-    @currentPage.setCustomHeaders(headers)
+    this.add_headers(headers, false, false)
+
+  add_headers: (headers, local = false, keepExisting = true) ->
+    pages = if local then [@currentPage] else @pages
+    pages.forEach (page) =>
+      allHeaders = if keepExisting then page.getCustomHeaders() else {}
+      for name, value of headers
+        allHeaders[name] = value
+      page.setUserAgent(allHeaders['User-Agent']) if allHeaders['User-Agent']
+      page.setCustomHeaders(allHeaders)
     @current_command.sendResponse(true)
 
-  add_headers: (headers) ->
-    allHeaders = @currentPage.getCustomHeaders()
-    for name, value of headers
-      allHeaders[name] = value
-    this.set_headers(allHeaders)
-
   add_header: (header, { permanent = true }) ->
     unless permanent == true
       @currentPage.addTempHeader(header)
       @currentPage.addTempHeaderToRemoveOnRedirect(header) if permanent == "no_redirect"
-    this.add_headers(header)
+    this.add_headers(header, permanent != true)
 
   response_headers: ->
     @current_command.sendResponse(@currentPage.responseHeaders())
@@ -511,6 +521,11 @@ class Poltergeist.Browser
     @_debug = value
     @current_command.sendResponse(true)
 
+  set_page_settings: (settings)->
+    @_page_settings = settings
+    @page.setSettings(@_page_settings)
+    @current_command.sendResponse(true)
+
   exit: ->
     phantom.exit()
 

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

@@ -25,8 +25,8 @@ PoltergeistAgent = (function() {
     }
   };
 
-  PoltergeistAgent.prototype.currentUrl = function() {
-    return window.location.href.replace(/\ /g, '%20');
+  PoltergeistAgent.prototype.frameUrl = function() {
+    return window.location.href;
   };
 
   PoltergeistAgent.prototype.find = function(method, selector, within) {
@@ -99,7 +99,12 @@ PoltergeistAgent = (function() {
   };
 
   PoltergeistAgent.prototype.clearLocalStorage = function() {
-    return typeof localStorage !== "undefined" && localStorage !== null ? localStorage.clear() : void 0;
+    var error;
+    try {
+      return typeof localStorage !== "undefined" && localStorage !== null ? localStorage.clear() : void 0;
+    } catch (error1) {
+      error = error1;
+    }
   };
 
   PoltergeistAgent.prototype.wrapResults = function(result, page_id) {
@@ -388,10 +393,10 @@ PoltergeistAgent.Node = (function() {
     } else if (value === false && !this.element.parentNode.multiple) {
       return false;
     } else {
-      this.trigger('focus', this.element.parentNode);
+      this.trigger('focus', {}, this.element.parentNode);
       this.element.selected = value;
       this.changed();
-      this.trigger('blur', this.element.parentNode);
+      this.trigger('blur', {}, this.element.parentNode);
       return true;
     }
   };
@@ -497,14 +502,17 @@ PoltergeistAgent.Node = (function() {
     return pos;
   };
 
-  Node.prototype.trigger = function(name, element) {
+  Node.prototype.trigger = function(name, options, element) {
     var event;
+    if (options == null) {
+      options = {};
+    }
     if (element == null) {
       element = this.element;
     }
     if (Node.EVENTS.MOUSE.indexOf(name) !== -1) {
       event = document.createEvent('MouseEvent');
-      event.initMouseEvent(name, true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+      event.initMouseEvent(name, true, true, window, 0, options['screenX'] || 0, options['screenY'] || 0, options['clientX'] || 0, options['clientY'] || 0, options['ctrlKey'] || false, options['altKey'] || false, options['shiftKey'] || false, options['metaKey'] || false, options['button'] || 0, null);
     } else if (Node.EVENTS.FOCUS.indexOf(name) !== -1) {
       event = this.obtainEvent(name);
     } else if (Node.EVENTS.FORM.indexOf(name) !== -1) {
@@ -614,3 +622,7 @@ window.__poltergeist = new PoltergeistAgent;
 document.addEventListener('DOMContentLoaded', function() {
   return console.log('__DOMContentLoaded');
 });
+
+if (document.readyState === 'complete') {
+  console.log('__DOMContentLoaded');
+}

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

@@ -9,6 +9,7 @@ Poltergeist.Browser = (function() {
     this.js_errors = true;
     this._debug = false;
     this._counter = 0;
+    this._page_settings = null;
     this.processed_modal_messages = [];
     this.confirm_processes = [];
     this.prompt_responses = [];
@@ -20,14 +21,14 @@ Poltergeist.Browser = (function() {
     ref = [0, []], this._counter = ref[0], this.pages = ref[1];
     if (this.page != null) {
       if (!this.page.closed) {
-        if (this.page.currentUrl() !== 'about:blank') {
+        if (this.page.frameUrl() !== 'about:blank') {
           this.page.clearLocalStorage();
         }
         this.page.close();
       }
       phantom.clearCookies();
     }
-    this.page = this.currentPage = new Poltergeist.WebPage;
+    this.page = this.currentPage = new Poltergeist.WebPage(null, this._page_settings);
     this.page.setViewportSize({
       width: this.width,
       height: this.height
@@ -71,11 +72,13 @@ Poltergeist.Browser = (function() {
     page.onPageCreated = (function(_this) {
       return function(newPage) {
         var _page;
-        _page = new Poltergeist.WebPage(newPage);
+        _page = new Poltergeist.WebPage(newPage, _this._page_settings);
         _page.handle = "" + (_this._counter++);
         _page.urlBlacklist = page.urlBlacklist;
         _page.urlWhitelist = page.urlWhitelist;
         _page.setViewportSize(page.viewportSize());
+        _page.setUserAgent(page.getUserAgent());
+        _page.setCustomHeaders(page.getPermanentCustomHeaders());
         _this.setupPageHandlers(_page);
         return _this.pages.push(_page);
       };
@@ -129,7 +132,7 @@ Poltergeist.Browser = (function() {
     this.processed_modal_messages = [];
     this.confirm_processes = [];
     this.prompt_responses = [];
-    prevUrl = this.currentPage.source === null ? 'about:blank' : this.currentPage.currentUrl();
+    prevUrl = this.currentPage.source != null ? this.currentPage.currentUrl() : 'about:blank';
     this.currentPage.open(url);
     if (/#/.test(url) && prevUrl.split('#')[0] === url.split('#')[0]) {
       this.currentPage.state = 'default';
@@ -160,6 +163,10 @@ Poltergeist.Browser = (function() {
     return this.current_command.sendResponse(this.currentPage.currentUrl());
   };
 
+  Browser.prototype.frame_url = function() {
+    return this.current_command.sendResponse(this.currentPage.frameUrl());
+  };
+
   Browser.prototype.status_code = function() {
     return this.current_command.sendResponse(this.currentPage.statusCode);
   };
@@ -176,6 +183,10 @@ Poltergeist.Browser = (function() {
     return this.current_command.sendResponse(this.currentPage.title());
   };
 
+  Browser.prototype.frame_title = function() {
+    return this.current_command.sendResponse(this.currentPage.frameTitle());
+  };
+
   Browser.prototype.find = function(method, selector) {
     return this.current_command.sendResponse({
       page_id: this.currentPage.id,
@@ -311,8 +322,8 @@ Poltergeist.Browser = (function() {
     return this.current_command.sendResponse(true);
   };
 
-  Browser.prototype.frameUrl = function(frame_name) {
-    return this.currentPage.frameUrl(frame_name);
+  Browser.prototype.frameUrlFor = function(frame_name) {
+    return this.currentPage.frameUrlFor(frame_name);
   };
 
   Browser.prototype.pushFrame = function(command, name, timeout) {
@@ -325,11 +336,11 @@ Poltergeist.Browser = (function() {
         name = frame.getAttribute('name');
       }
     }
-    frame_url = this.frameUrl(name);
+    frame_url = this.frameUrlFor(name);
     if (indexOf.call(this.currentPage.blockedUrls(), frame_url) >= 0) {
       return command.sendResponse(true);
     } else if (this.currentPage.pushFrame(name)) {
-      if (frame_url && (frame_url !== 'about:blank') && (this.currentPage.currentUrl() === 'about:blank')) {
+      if (frame_url && (frame_url !== 'about:blank') && (this.currentPage.frameUrl() === 'about:blank')) {
         this.currentPage.state = 'awaiting_frame_load';
         return this.currentPage.waitState('default', function() {
           return command.sendResponse(true);
@@ -421,11 +432,17 @@ Poltergeist.Browser = (function() {
     }
   };
 
-  Browser.prototype.mouse_event = function(page_id, id, name) {
+  Browser.prototype.mouse_event = function(page_id, id, name, keys, offset) {
     var command, event_page, last_mouse_event, node;
+    if (keys == null) {
+      keys = [];
+    }
+    if (offset == null) {
+      offset = {};
+    }
     node = this.node(page_id, id);
     this.currentPage.state = 'mouse_event';
-    last_mouse_event = node.mouseEvent(name);
+    last_mouse_event = node.mouseEvent(name, keys, offset);
     event_page = this.currentPage;
     command = this.current_command;
     return setTimeout(function() {
@@ -444,16 +461,16 @@ Poltergeist.Browser = (function() {
     }, 5);
   };
 
-  Browser.prototype.click = function(page_id, id) {
-    return this.mouse_event(page_id, id, 'click');
+  Browser.prototype.click = function(page_id, id, keys, offset) {
+    return this.mouse_event(page_id, id, 'click', keys, offset);
   };
 
-  Browser.prototype.right_click = function(page_id, id) {
-    return this.mouse_event(page_id, id, 'rightclick');
+  Browser.prototype.right_click = function(page_id, id, keys, offset) {
+    return this.mouse_event(page_id, id, 'rightclick', keys, offset);
   };
 
-  Browser.prototype.double_click = function(page_id, id) {
-    return this.mouse_event(page_id, id, 'doubleclick');
+  Browser.prototype.double_click = function(page_id, id, keys, offset) {
+    return this.mouse_event(page_id, id, 'doubleclick', keys, offset);
   };
 
   Browser.prototype.hover = function(page_id, id) {
@@ -643,21 +660,33 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.set_headers = function(headers) {
-    if (headers['User-Agent']) {
-      this.currentPage.setUserAgent(headers['User-Agent']);
-    }
-    this.currentPage.setCustomHeaders(headers);
-    return this.current_command.sendResponse(true);
+    return this.add_headers(headers, false, false);
   };
 
-  Browser.prototype.add_headers = function(headers) {
-    var allHeaders, name, value;
-    allHeaders = this.currentPage.getCustomHeaders();
-    for (name in headers) {
-      value = headers[name];
-      allHeaders[name] = value;
+  Browser.prototype.add_headers = function(headers, local, keepExisting) {
+    var pages;
+    if (local == null) {
+      local = false;
     }
-    return this.set_headers(allHeaders);
+    if (keepExisting == null) {
+      keepExisting = true;
+    }
+    pages = local ? [this.currentPage] : this.pages;
+    pages.forEach((function(_this) {
+      return function(page) {
+        var allHeaders, name, value;
+        allHeaders = keepExisting ? page.getCustomHeaders() : {};
+        for (name in headers) {
+          value = headers[name];
+          allHeaders[name] = value;
+        }
+        if (allHeaders['User-Agent']) {
+          page.setUserAgent(allHeaders['User-Agent']);
+        }
+        return page.setCustomHeaders(allHeaders);
+      };
+    })(this));
+    return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.add_header = function(header, arg1) {
@@ -669,7 +698,7 @@ Poltergeist.Browser = (function() {
         this.currentPage.addTempHeaderToRemoveOnRedirect(header);
       }
     }
-    return this.add_headers(header);
+    return this.add_headers(header, permanent !== true);
   };
 
   Browser.prototype.response_headers = function() {
@@ -715,6 +744,12 @@ Poltergeist.Browser = (function() {
     return this.current_command.sendResponse(true);
   };
 
+  Browser.prototype.set_page_settings = function(settings) {
+    this._page_settings = settings;
+    this.page.setSettings(this._page_settings);
+    return this.current_command.sendResponse(true);
+  };
+
   Browser.prototype.exit = function() {
     return phantom.exit();
   };

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

@@ -27,8 +27,11 @@ Poltergeist.Node = (function() {
     fn(name);
   }
 
-  Node.prototype.mouseEventPosition = function() {
-    var area_offset, image, middle, pos, res, viewport;
+  Node.prototype.mouseEventPosition = function(offset) {
+    var area_offset, image, middle, pos, viewport;
+    if (offset == null) {
+      offset = {};
+    }
     viewport = this.page.viewportSize();
     if (image = this._getAreaImage()) {
       pos = image.position();
@@ -44,27 +47,51 @@ Poltergeist.Node = (function() {
     middle = function(start, end, size) {
       return start + ((Math.min(end, size) - start) / 2);
     };
-    return res = {
-      x: middle(pos.left, pos.right, viewport.width),
-      y: middle(pos.top, pos.bottom, viewport.height)
-    };
+    if ((offset['x'] != null) && (offset['y'] != null)) {
+      return {
+        x: pos.left + offset['x'],
+        y: pos.top + offset['y']
+      };
+    } else {
+      return {
+        x: middle(pos.left, pos.right, viewport.width),
+        y: middle(pos.top, pos.bottom, viewport.height)
+      };
+    }
   };
 
-  Node.prototype.mouseEvent = function(name) {
-    var area_image, pos, test;
+  Node.prototype.mouseEvent = function(name, keys, offset) {
+    var area_image, modifier_keys, modifiers_code, pos, scroll_pos, test;
     if (area_image = this._getAreaImage()) {
       area_image.scrollIntoView();
     } else {
       this.scrollIntoView();
     }
-    pos = this.mouseEventPosition();
+    pos = this.mouseEventPosition(offset);
     test = this.mouseEventTest(pos.x, pos.y);
     if (test.status === 'success') {
+      modifier_keys = (keys || []).join(',').replace('control', 'ctrl');
+      modifiers_code = this.page.keyModifierCode(modifier_keys);
       if (name === 'rightclick') {
-        this.page.mouseEvent('click', pos.x, pos.y, 'right');
-        this.trigger('contextmenu');
+        this.page.mouseEvent('click', pos.x, pos.y, 'right', modifiers_code);
+        if (phantom.version.major === 2 && phantom.version.minor >= 1) {
+          this.page.sendEvent('contextmenu', pos.x, pos.y, 'right', modifiers_code);
+        } else {
+          scroll_pos = this.page.scrollPosition();
+          this.trigger('contextmenu', {
+            screenX: pos.x,
+            screenY: pos.y,
+            clientX: pos.x + scroll_pos['left'],
+            clientY: pos.y + scroll_pos['top'],
+            ctrlKey: modifier_keys.indexOf('ctrl') !== -1,
+            altKey: modifier_keys.indexOf('alt') !== -1,
+            metaKey: modifier_keys.indexOf('meta') !== -1,
+            shiftKey: modifier_keys.indexOf('shift') !== -1,
+            button: 2
+          });
+        }
       } else {
-        this.page.mouseEvent(name, pos.x, pos.y);
+        this.page.mouseEvent(name, pos.x, pos.y, 'left', modifiers_code);
       }
       return pos;
     } else {

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

@@ -6,15 +6,15 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
 Poltergeist.WebPage = (function() {
   var command, delegate, fn1, fn2, i, j, len, len1, ref, ref1;
 
-  WebPage.CALLBACKS = ['onConsoleMessage', 'onError', 'onLoadFinished', 'onInitialized', 'onLoadStarted', 'onResourceRequested', 'onResourceReceived', 'onResourceError', 'onNavigationRequested', 'onUrlChanged', 'onPageCreated', 'onClosing', 'onCallback'];
+  WebPage.CALLBACKS = ['onConsoleMessage', 'onError', 'onLoadFinished', 'onInitialized', 'onLoadStarted', 'onResourceRequested', 'onResourceReceived', 'onResourceError', 'onResourceTimeout', 'onNavigationRequested', 'onUrlChanged', 'onPageCreated', 'onClosing', 'onCallback'];
 
-  WebPage.DELEGATES = ['open', 'sendEvent', 'uploadFile', 'render', 'close', 'renderBase64', 'goBack', 'goForward', 'reload'];
+  WebPage.DELEGATES = ['url', 'open', 'sendEvent', 'uploadFile', 'render', 'close', 'renderBase64', 'goBack', 'goForward', 'reload'];
 
-  WebPage.COMMANDS = ['currentUrl', 'find', 'nodeCall', 'documentSize', 'beforeUpload', 'afterUpload', 'clearLocalStorage'];
+  WebPage.COMMANDS = ['find', 'nodeCall', 'documentSize', 'beforeUpload', 'afterUpload', 'clearLocalStorage'];
 
   WebPage.EXTENSIONS = [];
 
-  function WebPage(_native) {
+  function WebPage(_native, settings) {
     var callback, i, len, ref;
     this._native = _native;
     this._checkForAsyncResult = bind(this._checkForAsyncResult, this);
@@ -34,6 +34,7 @@ Poltergeist.WebPage = (function() {
     this._tempHeadersToRemoveOnRedirect = {};
     this._asyncResults = {};
     this._asyncEvaluationId = 0;
+    this.setSettings(settings);
     ref = WebPage.CALLBACKS;
     for (i = 0, len = ref.length; i < len; i++) {
       callback = ref[i];
@@ -68,6 +69,19 @@ Poltergeist.WebPage = (function() {
     fn2(delegate);
   }
 
+  WebPage.prototype.setSettings = function(settings) {
+    var results, setting, value;
+    if (settings == null) {
+      settings = {};
+    }
+    results = [];
+    for (setting in settings) {
+      value = settings[setting];
+      results.push(this._native.settings[setting] = value);
+    }
+    return results;
+  };
+
   WebPage.prototype.onInitializedNative = function() {
     this.id += 1;
     this.source = null;
@@ -182,6 +196,10 @@ Poltergeist.WebPage = (function() {
     return true;
   };
 
+  WebPage.prototype.onResourceTimeoutNative = function(request) {
+    return console.log("Resource request timed out for " + request.url);
+  };
+
   WebPage.prototype.injectAgent = function() {
     var extension, k, len2, ref2;
     if (this["native"]().evaluate(function() {
@@ -366,10 +384,26 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.title = function() {
+    return this["native"]().title;
+  };
+
+  WebPage.prototype.frameTitle = function() {
     return this["native"]().frameTitle;
   };
 
-  WebPage.prototype.frameUrl = function(frameNameOrId) {
+  WebPage.prototype.currentUrl = function() {
+    return this["native"]().url;
+  };
+
+  WebPage.prototype.frameUrl = function() {
+    if (phantom.version.major > 2 || (phantom.version.major === 2 && phantom.version.minor >= 1)) {
+      return this["native"]().frameUrl;
+    } else {
+      return this.runCommand('frameUrl');
+    }
+  };
+
+  WebPage.prototype.frameUrlFor = function(frameNameOrId) {
     var query;
     query = function(frameNameOrId) {
       var ref2;
@@ -438,6 +472,10 @@ Poltergeist.WebPage = (function() {
     }, selector);
   };
 
+  WebPage.prototype.getUserAgent = function() {
+    return this["native"]().settings.userAgent;
+  };
+
   WebPage.prototype.setUserAgent = function(userAgent) {
     return this["native"]().settings.userAgent = userAgent;
   };
@@ -446,6 +484,22 @@ Poltergeist.WebPage = (function() {
     return this["native"]().customHeaders;
   };
 
+  WebPage.prototype.getPermanentCustomHeaders = function() {
+    var allHeaders, name, ref2, ref3, value;
+    allHeaders = this.getCustomHeaders();
+    ref2 = this._tempHeaders;
+    for (name in ref2) {
+      value = ref2[name];
+      delete allHeaders[name];
+    }
+    ref3 = this._tempHeadersToRemoveOnRedirect;
+    for (name in ref3) {
+      value = ref3[name];
+      delete allHeaders[name];
+    }
+    return allHeaders;
+  };
+
   WebPage.prototype.setCustomHeaders = function(headers) {
     return this["native"]().customHeaders = headers;
   };
@@ -561,12 +615,15 @@ Poltergeist.WebPage = (function() {
     return new Poltergeist.Node(this, id);
   };
 
-  WebPage.prototype.mouseEvent = function(name, x, y, button) {
+  WebPage.prototype.mouseEvent = function(name, x, y, button, modifiers) {
     if (button == null) {
       button = 'left';
     }
+    if (modifiers == null) {
+      modifiers = 0;
+    }
     this.sendEvent('mousemove', x, y);
-    return this.sendEvent(name, x, y, button);
+    return this.sendEvent(name, x, y, button, modifiers);
   };
 
   WebPage.prototype.evaluate = function() {

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

@@ -17,7 +17,7 @@ class Poltergeist.Node
       this.prototype[name] = (args...) ->
         @page.nodeCall(@id, name, args)
 
-  mouseEventPosition: ->
+  mouseEventPosition: (offset = {})->
     viewport = @page.viewportSize()
 
     if image = @_getAreaImage()
@@ -34,25 +34,44 @@ class Poltergeist.Node
     middle = (start, end, size) ->
       start + ((Math.min(end, size) - start) / 2)
 
-    res = {
+    if offset['x']? && offset['y']?
+      x: pos.left + offset['x'],
+      y: pos.top + offset['y']
+    else
       x: middle(pos.left, pos.right,  viewport.width),
       y: middle(pos.top,  pos.bottom, viewport.height)
-    }
 
 
-  mouseEvent: (name) ->
+  mouseEvent: (name, keys, offset) ->
     if area_image = @_getAreaImage()
       area_image.scrollIntoView()
     else
       @scrollIntoView()
-    pos = this.mouseEventPosition()
+    pos = this.mouseEventPosition(offset)
     test = this.mouseEventTest(pos.x, pos.y)
     if test.status == 'success'
+      modifier_keys = (keys || []).join(',').replace('control', 'ctrl')
+      modifiers_code = @page.keyModifierCode(modifier_keys)
       if name == 'rightclick'
-        @page.mouseEvent('click', pos.x, pos.y, 'right')
-        this.trigger('contextmenu')
+        @page.mouseEvent('click', pos.x, pos.y, 'right', modifiers_code)
+        if phantom.version.major == 2 && phantom.version.minor >= 1
+           @page.sendEvent('contextmenu', pos.x, pos.y, 'right', modifiers_code)
+        else
+          scroll_pos = @page.scrollPosition()
+          @trigger('contextmenu',
+            screenX: pos.x
+            screenY: pos.y
+            clientX: pos.x + scroll_pos['left']
+            clientY: pos.y + scroll_pos['top']
+            ctrlKey: modifier_keys.indexOf('ctrl') != -1
+            altKey: modifier_keys.indexOf('alt') != -1
+            metaKey: modifier_keys.indexOf('meta') != -1
+            shiftKey: modifier_keys.indexOf('shift') != -1
+            button: 2
+          )
       else
-        @page.mouseEvent(name, pos.x, pos.y)
+        @page.mouseEvent(name, pos.x, pos.y, 'left', modifiers_code)
+
       pos
     else
       throw new Poltergeist.MouseEventFailed(name, test.selector, pos)

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

@@ -1,19 +1,20 @@
 class Poltergeist.WebPage
   @CALLBACKS = ['onConsoleMessage','onError',
                 'onLoadFinished', 'onInitialized', 'onLoadStarted',
-                'onResourceRequested', 'onResourceReceived', 'onResourceError',
+                'onResourceRequested', 'onResourceReceived', 'onResourceError', 'onResourceTimeout',
                 'onNavigationRequested', 'onUrlChanged', 'onPageCreated',
                 'onClosing', 'onCallback']
 
-  @DELEGATES = ['open', 'sendEvent', 'uploadFile', 'render', 'close',
+  @DELEGATES = ['url', 'open', 'sendEvent', 'uploadFile', 'render', 'close',
                 'renderBase64', 'goBack', 'goForward', 'reload']
 
-  @COMMANDS  = ['currentUrl', 'find', 'nodeCall', 'documentSize',
+  # @COMMANDS  = ['currentUrl', 'find', 'nodeCall', 'documentSize',
+  @COMMANDS  = ['find', 'nodeCall', 'documentSize',
                 'beforeUpload', 'afterUpload', 'clearLocalStorage']
 
   @EXTENSIONS = []
 
-  constructor: (@_native) ->
+  constructor: (@_native, settings) ->
     @_native or= require('webpage').create()
 
     @id              = 0
@@ -32,6 +33,8 @@ class Poltergeist.WebPage
     @_asyncResults = {}
     @_asyncEvaluationId = 0
 
+    @setSettings(settings)
+
     for callback in WebPage.CALLBACKS
       this.bindCallback(callback)
 
@@ -48,6 +51,9 @@ class Poltergeist.WebPage
       this.prototype[delegate] =
         -> @_native[delegate].apply(@_native, arguments)
 
+  setSettings: (settings = {})->
+    @_native.settings[setting] = value for setting, value of settings
+
   onInitializedNative: ->
     @id += 1
     @source = null
@@ -134,6 +140,9 @@ class Poltergeist.WebPage
     delete @_requestedResources[errorResponse.id]
     return true
 
+  onResourceTimeoutNative: (request) ->
+    console.log "Resource request timed out for #{request.url}"
+
   injectAgent: ->
     if this.native().evaluate(-> typeof __poltergeist) == "undefined"
       this.native().injectJs "#{phantom.libraryPath}/agent.js"
@@ -221,9 +230,21 @@ class Poltergeist.WebPage
     this.native().frameContent
 
   title: ->
+    this.native().title
+
+  frameTitle: ->
     this.native().frameTitle
 
-  frameUrl: (frameNameOrId) ->
+  currentUrl: ->
+    @native().url
+
+  frameUrl: ->
+    if phantom.version.major > 2 || (phantom.version.major == 2 && phantom.version.minor >= 1)
+      @native().frameUrl
+    else
+      @runCommand('frameUrl')
+
+  frameUrlFor: (frameNameOrId) ->
     query = (frameNameOrId) ->
       document.querySelector("iframe[name='#{frameNameOrId}'], iframe[id='#{frameNameOrId}']")?.src
     this.evaluate(query, frameNameOrId)
@@ -275,12 +296,23 @@ class Poltergeist.WebPage
       , selector
     )
 
+  getUserAgent: ->
+    this.native().settings.userAgent
+
   setUserAgent: (userAgent) ->
     this.native().settings.userAgent = userAgent
 
   getCustomHeaders: ->
     this.native().customHeaders
 
+  getPermanentCustomHeaders: ->
+    allHeaders = @getCustomHeaders()
+    for name, value of @_tempHeaders
+      delete allHeaders[name]
+    for name, value of @_tempHeadersToRemoveOnRedirect
+      delete allHeaders[name]
+    allHeaders
+
   setCustomHeaders: (headers) ->
     this.native().customHeaders = headers
 
@@ -354,9 +386,9 @@ class Poltergeist.WebPage
 
   # Before each mouse event we make sure that the mouse is moved to where the
   # event will take place. This deals with e.g. :hover changes.
-  mouseEvent: (name, x, y, button = 'left') ->
+  mouseEvent: (name, x, y, button = 'left', modifiers = 0) ->
     this.sendEvent('mousemove', x, y)
-    this.sendEvent(name, x, y, button)
+    this.sendEvent(name, x, y, button, modifiers)
 
   evaluate: (fn, args...) ->
     this.injectAgent()

data/lib/capybara/poltergeist/driver.rb

@@ -30,6 +30,7 @@ module Capybara::Poltergeist
         browser.debug      = true if options[:debug]
         browser.url_blacklist = options[:url_blacklist] if options.key?(:url_blacklist)
         browser.url_whitelist = options[:url_whitelist] if options.key?(:url_whitelist)
+        browser.page_settings = options[:page_settings] if options.key?(:page_settings)
         browser
       end
     end
@@ -100,7 +101,15 @@ module Capybara::Poltergeist
     end
 
     def current_url
-      browser.current_url
+      if Capybara::VERSION.to_f < 3.0
+        frame_url
+      else
+        browser.current_url.gsub(' ', '%20') # PhantomJS < 2.1 doesn't escape spaces
+      end
+    end
+
+    def frame_url
+      browser.frame_url.gsub(' ', '%20') # PhantomJS < 2.1 doesn't escape spaces
     end
 
     def status_code
@@ -117,7 +126,15 @@ module Capybara::Poltergeist
     end
 
     def title
-      browser.title
+      if Capybara::VERSION.to_f < 3.0
+        frame_title
+      else
+        browser.title
+      end
+    end
+
+    def frame_title
+      browser.frame_title
     end
 
     def find(method, selector)

data/lib/capybara/poltergeist/node.rb

@@ -49,7 +49,15 @@ module Capybara::Poltergeist
     end
 
     def visible_text
-      filter_text command(:visible_text)
+      if Capybara::VERSION.to_f < 3.0
+        filter_text command(:visible_text)
+      else
+        command(:visible_text).to_s
+                              .gsub(/\A[[:space:]&&[^\u00a0]]+/, "")
+                              .gsub(/[[:space:]&&[^\u00a0]]+\z/, "")
+                              .gsub(/\n+/, "\n")
+                              .tr("\u00a0", ' ')
+      end
     end
 
     def property(name)
@@ -79,7 +87,9 @@ module Capybara::Poltergeist
       command :value
     end
 
-    def set(value)
+    def set(value, options = {})
+      warn "Options passed to Node#set but Poltergeist doesn't currently support any - ignoring" unless options.empty?
+
       if tag_name == 'input'
         case self[:type]
         when 'radio'
@@ -129,16 +139,16 @@ module Capybara::Poltergeist
       command :disabled?
     end
 
-    def click
-      command :click
+    def click(keys=[], offset={})
+      command :click, keys, offset
     end
 
-    def right_click
-      command :right_click
+    def right_click(keys=[], offset={})
+      command :right_click, keys, offset
     end
 
-    def double_click
-      command :double_click
+    def double_click(keys=[], offset={})
+      command :double_click, keys, offset
     end
 
     def hover
@@ -182,8 +192,16 @@ module Capybara::Poltergeist
 
     private
 
-    def filter_text(text)
-      Capybara::Helpers.normalize_whitespace(text.to_s)
+    def filter_text(text, visible = true)
+      if Capybara::VERSION.to_f < 3
+        Capybara::Helpers.normalize_whitespace(text.to_s)
+      else
+        text.gsub(/[\u200b\u200e\u200f]/, '')
+            .gsub(/[\ \n\f\t\v\u2028\u2029]+/, ' ')
+            .gsub(/\A[[:space:]&&[^\u00a0]]+/, "")
+            .gsub(/[[:space:]&&[^\u00a0]]+\z/, "")
+            .tr("\u00a0", ' ')
+      end
     end
   end
 end

data/lib/capybara/poltergeist/version.rb

@@ -2,6 +2,6 @@
 
 module Capybara
   module Poltergeist
-    VERSION = "1.17.0"
+    VERSION = "1.18.0"
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
@@ -273,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.0
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: PhantomJS driver for Capybara