poltergeist 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 475593a2e1c767e61acb2023b065eb7688972efa
-  data.tar.gz: d35e4e7d9d2245564ea960045a891589c6a1dbed
+  metadata.gz: cc14ad1bf5ce9dacde0dfef301ec4fca4e46bd4d
+  data.tar.gz: 41bb2dbf585f8c59b32eeb7b10e7289dae0d193e
 SHA512:
-  metadata.gz: 14677723d5e05debc486229fbe765a5e4fa6fdd49620daf32bcac5347c8856ea448946babba7904574ab904400ae9ae5db125de9d56683a745f6719a22f4c840
-  data.tar.gz: fd6f1a43a661fc191cc7e80e63ed02bb601dbf21c17f40145a24da82941859add75100da027e8656450c0aed062606d6e17cc33d9e0da538cacd9d2a71358550
+  metadata.gz: 48a9db9338cbca32461001b10787638bd486cbfe4f3ebf4ec5a080a20abbefc7a79b5ced7788e2d935d4f06d0dc86aae37325a3b0df53e3504d8bb1e77e61f05
+  data.tar.gz: 2f75709c6262d5fd35075eadaa7a633f9ade052b68dc3a382ec5d6afeb5574d3a8d956d846caf07fc5de9c10a9a9b16d789065f67ba7ed6589adb2efcba4c666

data/README.md

@@ -1,6 +1,6 @@
 # Poltergeist - A PhantomJS driver for Capybara #
 
-[![Build Status](https://secure.travis-ci.org/teampoltergeist/poltergeist.png)](http://travis-ci.org/teampoltergeist/poltergeist)
+[![Build Status](https://secure.travis-ci.org/teampoltergeist/poltergeist.svg)](http://travis-ci.org/teampoltergeist/poltergeist)
 
 Poltergeist is a driver for [Capybara](https://github.com/jnicklas/capybara). It allows you to
 run your Capybara tests on a headless [WebKit](http://webkit.org) browser,
@@ -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.9.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.9.0)**
+(1.10.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.10.0)**
 
 ## Getting help ##
 
@@ -109,7 +109,7 @@ and the following optional features:
 * `page.driver.render_base64(format, options)`
 * `page.driver.scroll_to(left, top)`
 * `page.driver.basic_authorize(user, password)`
-* `element.native.send_keys(*keys)`
+* `element.send_keys(*keys)`
 * `page.driver.set_proxy(ip, port, type, user, password)`
 * window API
 * cookie handling
@@ -130,7 +130,7 @@ view). To render the entire page, use `save_screenshot('/path/to/file.png',
 :full => true)`.
 
 You also have an ability to render selected element. Pass option `selector` with
-any valid element selector to make a screenshot bounded by that element
+any valid CSS element selector to make a screenshot bounded by that element
 `save_screenshot('/path/to/file.png', :selector => '#id')`.
 
 If you need for some reasons base64 encoded screenshot you can simply call
@@ -226,14 +226,14 @@ There's an ability to send arbitrary keys to the element:
 
 ``` ruby
 element = find('input#id')
-element.native.send_key('String')
+element.send_keys('String')
 ```
 
 or even more complicated:
 
 ``` ruby
-element.native.send_keys('H', 'elo', :Left, 'l') # => 'Hello'
-element.native.send_key(:Enter) # triggers Enter key
+element.send_keys('H', 'elo', :left, 'l') # => 'Hello'
+element.send_keys(:enter) # triggers Enter key
 ```
 Since it's implemented natively in PhantomJS this will exactly imitate user
 behavior.
@@ -266,6 +266,8 @@ end
 *   `:js_errors` (Boolean) - When false, JavaScript errors do not get re-raised in Ruby.
 *   `:window_size` (Array) - The dimensions of the browser window in which to test, expressed
     as a 2-element array, e.g. [1024, 768]. Default: [1024, 768]
+*   `:screen_size` (Array) - The dimensions the window size will be set to when Window#maximize is called.  Expressed
+    as a 2-element array, e.g. [1600, 1200]. Default: [1366, 768]
 *   `:phantomjs_options` (Array) - Additional [command line options](http://phantomjs.org/api/command-line.html)
     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

data/lib/capybara/poltergeist/browser.rb

@@ -140,6 +140,17 @@ module Capybara::Poltergeist
       command 'pop_frame'
     end
 
+    def switch_to_frame(handle, &block)
+      case handle
+      when Capybara::Node::Base
+        command 'push_frame', [handle.native.page_id, handle.native.id]
+      when :parent
+        command 'pop_frame'
+      when :top
+        command 'pop_frame', true
+      end
+    end
+
     def window_handle
       command 'window_handle'
     end

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

@@ -236,8 +236,8 @@ class Poltergeist.Browser
   push_frame: (name, timeout = (new Date().getTime()) + 2000) ->
     @pushFrame(@current_command, name, timeout)
 
-  pop_frame: ->
-    @current_command.sendResponse(@currentPage.popFrame())
+  pop_frame: (pop_all = false)->
+    @current_command.sendResponse(@currentPage.popFrame(pop_all))
 
   window_handles: ->
     handles = @pages.filter((p) -> !p.closed).map((p) -> p.handle)
@@ -346,7 +346,10 @@ class Poltergeist.Browser
       target.mouseEvent('click')
 
     for sequence in keys
-      key = if sequence.key? then @currentPage.keyCode(sequence.key) else sequence
+      key = if sequence.key?
+        @currentPage.keyCode(sequence.key) || sequence.key
+      else
+        sequence
       if sequence.modifier?
         modifier_keys = @currentPage.keyModifierKeys(sequence.modifier)
         modifier_code = @currentPage.keyModifierCode(sequence.modifier)

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

@@ -1,6 +1,6 @@
 class Poltergeist.Cmd
   constructor: (@owner, @id, @name, @args)->
-
+    @_response_sent = false
   sendResponse: (response) ->
     errors = @browser.currentPage.errors
     @browser.currentPage.clearErrors()
@@ -8,10 +8,19 @@ class Poltergeist.Cmd
     if errors.length > 0 && @browser.js_errors
       @sendError(new Poltergeist.JavascriptError(errors))
     else
-      @owner.sendResponse(@id, response)
+      @owner.sendResponse(@id, response) unless @_response_sent
+      @_response_sent = true
 
   sendError: (errors) ->
-    @owner.sendError(@id, errors)
+    @owner.sendError(@id, errors) unless @_response_sent
+    @_response_sent = true
 
   run: (@browser) ->
-    @browser.runCommand(this)
+    try
+      @browser.runCommand(this)
+    catch error
+      if error instanceof Poltergeist.Error
+        @sendError(error)
+      else
+        @sendError(new Poltergeist.BrowserError(error.toString(), error.stack))
+

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

@@ -304,8 +304,11 @@ Poltergeist.Browser = (function() {
     return this.pushFrame(this.current_command, name, timeout);
   };
 
-  Browser.prototype.pop_frame = function() {
-    return this.current_command.sendResponse(this.currentPage.popFrame());
+  Browser.prototype.pop_frame = function(pop_all) {
+    if (pop_all == null) {
+      pop_all = false;
+    }
+    return this.current_command.sendResponse(this.currentPage.popFrame(pop_all));
   };
 
   Browser.prototype.window_handles = function() {
@@ -454,7 +457,7 @@ Poltergeist.Browser = (function() {
     }
     for (i = 0, len = keys.length; i < len; i++) {
       sequence = keys[i];
-      key = sequence.key != null ? this.currentPage.keyCode(sequence.key) : sequence;
+      key = sequence.key != null ? this.currentPage.keyCode(sequence.key) || sequence.key : sequence;
       if (sequence.modifier != null) {
         modifier_keys = this.currentPage.keyModifierKeys(sequence.modifier);
         modifier_code = this.currentPage.keyModifierCode(sequence.modifier);

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

@@ -4,6 +4,7 @@ Poltergeist.Cmd = (function() {
     this.id = id;
     this.name = name;
     this.args = args;
+    this._response_sent = false;
   }
 
   Cmd.prototype.sendResponse = function(response) {
@@ -13,17 +14,33 @@ Poltergeist.Cmd = (function() {
     if (errors.length > 0 && this.browser.js_errors) {
       return this.sendError(new Poltergeist.JavascriptError(errors));
     } else {
-      return this.owner.sendResponse(this.id, response);
+      if (!this._response_sent) {
+        this.owner.sendResponse(this.id, response);
+      }
+      return this._response_sent = true;
     }
   };
 
   Cmd.prototype.sendError = function(errors) {
-    return this.owner.sendError(this.id, errors);
+    if (!this._response_sent) {
+      this.owner.sendError(this.id, errors);
+    }
+    return this._response_sent = true;
   };
 
   Cmd.prototype.run = function(browser) {
+    var error, error1;
     this.browser = browser;
-    return this.browser.runCommand(this);
+    try {
+      return this.browser.runCommand(this);
+    } catch (error1) {
+      error = error1;
+      if (error instanceof Poltergeist.Error) {
+        return this.sendError(error);
+      } else {
+        return this.sendError(new Poltergeist.BrowserError(error.toString(), error.stack));
+      }
+    }
   };
 
   return Cmd;

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

@@ -4,30 +4,17 @@ var Poltergeist, system,
 
 Poltergeist = (function() {
   function Poltergeist(port, width, height) {
-    var that;
     this.browser = new Poltergeist.Browser(width, height);
     this.connection = new Poltergeist.Connection(this, port);
-    that = this;
-    phantom.onError = function(message, stack) {
-      return that.onError(message, stack);
-    };
-    this.running = false;
+    phantom.onError = (function(_this) {
+      return function(message, stack) {
+        return _this.onError(message, stack);
+      };
+    })(this);
   }
 
   Poltergeist.prototype.runCommand = function(command) {
-    var error, error1;
-    this.running = true;
-    command = new Poltergeist.Cmd(this, command.id, command.name, command.args);
-    try {
-      return command.run(this.browser);
-    } catch (error1) {
-      error = error1;
-      if (error instanceof Poltergeist.Error) {
-        return this.sendError(command.id, error);
-      } else {
-        return this.sendError(command.id, new Poltergeist.BrowserError(error.toString(), error.stack));
-      }
-    }
+    return new Poltergeist.Cmd(this, command.id, command.name, command.args).run(this.browser);
   };
 
   Poltergeist.prototype.sendResponse = function(command_id, response) {
@@ -48,12 +35,8 @@ Poltergeist = (function() {
   };
 
   Poltergeist.prototype.send = function(data) {
-    if (this.running) {
-      this.connection.send(data);
-      this.running = false;
-      return true;
-    }
-    return false;
+    this.connection.send(data);
+    return true;
   };
 
   return Poltergeist;

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

@@ -23,7 +23,6 @@ Poltergeist.WebPage = (function() {
     this.state = 'default';
     this.urlWhitelist = [];
     this.urlBlacklist = [];
-    this.frames = [];
     this.errors = [];
     this._networkTraffic = {};
     this._tempHeaders = {};
@@ -422,36 +421,35 @@ Poltergeist.WebPage = (function() {
   WebPage.prototype.pushFrame = function(name) {
     var frame_no;
     if (this["native"]().switchToFrame(name)) {
-      this.frames.push(name);
       return true;
-    } else {
-      frame_no = this["native"]().evaluate(function(frame_name) {
-        var f, frames, idx;
-        frames = document.querySelectorAll("iframe, frame");
-        return ((function() {
-          var k, len2, results;
-          results = [];
-          for (idx = k = 0, len2 = frames.length; k < len2; idx = ++k) {
-            f = frames[idx];
-            if ((f != null ? f['name'] : void 0) === frame_name || (f != null ? f['id'] : void 0) === frame_name) {
-              results.push(idx);
-            }
-          }
-          return results;
-        })())[0];
-      }, name);
-      if ((frame_no != null) && this["native"]().switchToFrame(frame_no)) {
-        this.frames.push(name);
-        return true;
-      } else {
-        return false;
-      }
     }
+    frame_no = this["native"]().evaluate(function(frame_name) {
+      var f, frames, idx;
+      frames = document.querySelectorAll("iframe, frame");
+      return ((function() {
+        var k, len2, results;
+        results = [];
+        for (idx = k = 0, len2 = frames.length; k < len2; idx = ++k) {
+          f = frames[idx];
+          if ((f != null ? f['name'] : void 0) === frame_name || (f != null ? f['id'] : void 0) === frame_name) {
+            results.push(idx);
+          }
+        }
+        return results;
+      })())[0];
+    }, name);
+    return (frame_no != null) && this["native"]().switchToFrame(frame_no);
   };
 
-  WebPage.prototype.popFrame = function() {
-    this.frames.pop();
-    return this["native"]().switchToParentFrame();
+  WebPage.prototype.popFrame = function(pop_all) {
+    if (pop_all == null) {
+      pop_all = false;
+    }
+    if (pop_all) {
+      return this["native"]().switchToMainFrame();
+    } else {
+      return this["native"]().switchToParentFrame();
+    }
   };
 
   WebPage.prototype.dimensions = function() {
@@ -529,17 +527,17 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.bindCallback = function(name) {
-    var that;
-    that = this;
-    this["native"]()[name] = function() {
-      var result;
-      if (that[name + 'Native'] != null) {
-        result = that[name + 'Native'].apply(that, arguments);
-      }
-      if (result !== false && (that[name] != null)) {
-        return that[name].apply(that, arguments);
-      }
-    };
+    this["native"]()[name] = (function(_this) {
+      return function() {
+        var result;
+        if (_this[name + 'Native'] != null) {
+          result = _this[name + 'Native'].apply(_this, arguments);
+        }
+        if (result !== false && (_this[name] != null)) {
+          return _this[name].apply(_this, arguments);
+        }
+      };
+    })(this);
     return true;
   };
 

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

@@ -3,22 +3,10 @@ class Poltergeist
     @browser    = new Poltergeist.Browser(width, height)
     @connection = new Poltergeist.Connection(this, port)
 
-    # The QtWebKit bridge doesn't seem to like Function.prototype.bind
-    that = this
-    phantom.onError = (message, stack) -> that.onError(message, stack)
-
-    @running = false
+    phantom.onError = (message, stack) => @onError(message, stack)
 
   runCommand: (command) ->
-    @running = true
-    command = new Poltergeist.Cmd(this, command.id, command.name, command.args)
-    try
-      command.run(@browser)
-    catch error
-      if error instanceof Poltergeist.Error
-        this.sendError(command.id, error)
-      else
-        this.sendError(command.id, new Poltergeist.BrowserError(error.toString(), error.stack))
+    new Poltergeist.Cmd(this, command.id, command.name, command.args).run(@browser)
 
   sendResponse: (command_id, response) ->
     this.send(command_id: command_id, response: response)
@@ -32,14 +20,8 @@ class Poltergeist
     )
 
   send: (data) ->
-    # Prevents more than one response being sent for a single
-    # command. This can happen in some scenarios where an error
-    # is raised but the script can still continue.
-    if @running
-      @connection.send(data)
-      @running = false
-      return true
-    return false
+    @connection.send(data)
+    return true
 
 # This is necessary because the remote debugger will wrap the
 # script in a function, causing the Poltergeist variable to

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

@@ -22,7 +22,6 @@ class Poltergeist.WebPage
     @state           = 'default'
     @urlWhitelist    = []
     @urlBlacklist    = []
-    @frames          = []
     @errors          = []
     @_networkTraffic = {}
     @_tempHeaders    = {}
@@ -289,24 +288,21 @@ class Poltergeist.WebPage
     this.setCustomHeaders(allHeaders)
 
   pushFrame: (name) ->
-    if this.native().switchToFrame(name)
-      @frames.push(name)
-      return true
+    return true if this.native().switchToFrame(name)
+
+    # if switch by name fails - find index and try again
+    frame_no = this.native().evaluate(
+      (frame_name) ->
+        frames = document.querySelectorAll("iframe, frame")
+        (idx for f, idx in frames when f?['name'] == frame_name or f?['id'] == frame_name)[0]
+      , name)
+    frame_no? and this.native().switchToFrame(frame_no)
+
+  popFrame: (pop_all = false)->
+    if pop_all
+      this.native().switchToMainFrame()
     else
-      frame_no = this.native().evaluate(
-        (frame_name) ->
-          frames = document.querySelectorAll("iframe, frame")
-          (idx for f, idx in frames when f?['name'] == frame_name or f?['id'] == frame_name)[0]
-        , name)
-      if frame_no? and this.native().switchToFrame(frame_no)
-        @frames.push(name)
-        return true
-      else
-        return false
-
-  popFrame: ->
-    @frames.pop()
-    this.native().switchToParentFrame()
+      this.native().switchToParentFrame()
 
   dimensions: ->
     scroll   = this.scrollPosition()
@@ -365,16 +361,10 @@ class Poltergeist.WebPage
       # escaping the string.
       "(#{fn.toString()}).apply(this, PoltergeistAgent.JSON.parse(#{JSON.stringify(JSON.stringify(args))}))"
 
-  # For some reason phantomjs seems to have trouble with doing 'fat arrow' binding here,
-  # hence the 'that' closure.
   bindCallback: (name) ->
-    that = this
-    this.native()[name] = ->
-      if that[name + 'Native']? # For internal callbacks
-        result = that[name + 'Native'].apply(that, arguments)
-
-      if result != false && that[name]? # For externally set callbacks
-        that[name].apply(that, arguments)
+    @native()[name] = =>
+      result = @[name + 'Native'].apply(@, arguments) if @[name + 'Native']? # For internal callbacks
+      @[name].apply(@, arguments) if result != false && @[name]? # For externally set callbacks
     return true
 
   # Any error raised here or inside the evaluate will get reported to

data/lib/capybara/poltergeist/driver.rb

@@ -147,6 +147,10 @@ module Capybara::Poltergeist
       browser.within_frame(name, &block)
     end
 
+    def switch_to_frame(locator, &block)
+      browser.switch_to_frame(locator, &block)
+    end
+
     def current_window_handle
       browser.window_handle
     end
@@ -210,6 +214,10 @@ module Capybara::Poltergeist
       end
     end
 
+    def maximize_window(handle)
+      resize_window_to(handle, *screen_size)
+    end
+
     def window_size(handle)
       within_window(handle) do
         evaluate_script('[window.innerWidth, window.innerHeight]')
@@ -380,17 +388,21 @@ module Capybara::Poltergeist
 
     private
 
+    def screen_size
+      options[:screen_size] || [1366,768]
+    end
+
     def find_modal(options)
       start_time    = Time.now
       timeout_sec   = options[:wait] || begin Capybara.default_max_wait_time rescue Capybara.default_wait_time end
       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'
       not_found_msg += " with #{expect_text}" if expect_text
 
       begin
         modal_text = browser.modal_message
-        raise Capybara::ModalNotFound if modal_text.nil?
-        raise Capybara::ModalNotFound if (expect_text && (modal_text != expect_text))
+        raise Capybara::ModalNotFound if modal_text.nil? || (expect_text && !modal_text.match(expect_regexp))
       rescue Capybara::ModalNotFound => e
         raise e, not_found_msg if (Time.now - start_time) >= timeout_sec
         sleep(0.05)

data/lib/capybara/poltergeist/node.rb

@@ -92,7 +92,7 @@ module Capybara::Poltergeist
         end
       elsif tag_name == 'textarea'
         command :set, value.to_s
-      elsif self[:contenteditable] == 'true'
+      elsif self[:isContentEditable]
         command :delete_text
         send_keys(value.to_s)
       end

data/lib/capybara/poltergeist/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Poltergeist
-    VERSION = "1.10.0"
+    VERSION = "1.11.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -287,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: PhantomJS driver for Capybara