poltergeist 1.5.1 → 1.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTNhZjUzMmZiNmZlNDlkNzdkMjhlNjNhOTlmODhkZWU5YTBhODA2ZQ==
-  data.tar.gz: !binary |-
-    ZTFjYzAwNGI3YTM3ZGEwN2M0ZTI3MzAxMzNiYTI4MmY2YWQ2NjhiOA==
+SHA1:
+  metadata.gz: 804da55f4a9b382633c1ea2388078a0a464dcf20
+  data.tar.gz: 50f49ce4999e47f266a048ada3a4edb453aef88d
 SHA512:
-  metadata.gz: !binary |-
-    MTY1MTJiMGYxMTk5NTBlNDVmNDZkMDBlOWQ4ODk4MzNjZjA2ZDc3ZjFhNDZm
-    MWE4ZGVlYTA1ZmI1NWJkMjc3Y2RiZTE1YzEwNjQ0MzhjZGRhOTQ2NGQ5Zjgx
-    N2IxZTc0YWFmNTY5MTE5NDA0YjNjMzAyODE5ZjNhMGM5ZDkzZjk=
-  data.tar.gz: !binary |-
-    MjI0NTg2YzZhMjg0NzE4NzI2MDhhMjQyODQ2MzY4NDI3MWQxNWY0NGQ3YWUx
-    ZGIzNDJjZDQ1ZTJkMzVlN2FjYmY2NjUxMTBkZTI5NTE1NGU2M2E2ZjgwMmVj
-    MWQ0MGQzMzRjZTJjMzA1ZjMxMWM1Mzc0ZjAyNWViOWZlZmY0N2E=
+  metadata.gz: 6129b9fb4c4cd02030a40f4d1afe79a4fb8dbb4244c0bb93b00bfd6587dccb93ece045c089c6731e2538c8abd2ea73ceb18c7aa9fe34a883112a5682493caabe
+  data.tar.gz: 9abd3b5839e1342411eb869c83917fe1a45341278ec663d870274d9f5ca501f897b1b49505367d5f3601cd80eb0e456999b1cfec49f2c96428477f81e7eae8f7

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2013 Jonathan Leighton
+Copyright (c) 2011-2014 Jonathan Leighton
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,15 +1,15 @@
 # Poltergeist - A PhantomJS driver for Capybara #
 
-[![Build Status](https://secure.travis-ci.org/jonleighton/poltergeist.png)](http://travis-ci.org/jonleighton/poltergeist)
+[![Build Status](https://secure.travis-ci.org/teampoltergeist/poltergeist.png)](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,
 provided by [PhantomJS](http://www.phantomjs.org/).
 
-**If you're viewing this at https://github.com/jonleighton/poltergeist,
+**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.5.0).](https://github.com/jonleighton/poltergeist/tree/v1.5.0)**
+(1.6.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.6.0)**
 
 ## Getting help ##
 
@@ -17,7 +17,7 @@ Questions should be posted [on Stack
 Overflow, using the 'poltergeist' tag](http://stackoverflow.com/questions/tagged/poltergeist).
 
 Bug reports should be posted [on
-GitHub](https://github.com/jonleighton/poltergeist/issues) (and be sure
+GitHub](https://github.com/teampoltergeist/poltergeist/issues) (and be sure
 to read the bug reporting guidance below).
 
 ## Installation ##
@@ -43,17 +43,17 @@ dependencies* (you don't need Qt, or a running X server, etc.)
 
 * *Homebrew*: `brew install phantomjs`
 * *MacPorts*: `sudo port install phantomjs`
-* *Manual install*: [Download this](http://phantomjs.googlecode.com/files/phantomjs-1.9.2-macosx.zip)
+* *Manual install*: [Download this](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-macosx.zip)
 
 ### Linux ###
 
-* Download the [32 bit](https://phantomjs.googlecode.com/files/phantomjs-1.9.2-linux-i686.tar.bz2)
-or [64 bit](https://phantomjs.googlecode.com/files/phantomjs-1.9.2-linux-x86_64.tar.bz2)
+* Download the [32 bit](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-i686.tar.bz2)
+or [64 bit](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2)
 binary.
 * Extract the tarball and copy `bin/phantomjs` into your `PATH`
 
 ### Windows ###
-* Download the [precompiled binary](http://phantomjs.googlecode.com/files/phantomjs-1.9.2-windows.zip)
+* Download the [precompiled binary](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-windows.zip)
 for Windows
 
 ### Manual compilation ###
@@ -61,7 +61,7 @@ for Windows
 Do this as a last resort if the binaries don't work for you. It will
 take quite a long time as it has to build WebKit.
 
-* Download [the source tarball](http://phantomjs.googlecode.com/files/phantomjs-1.9.2-source.zip)
+* Download [the source tarball](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-source.zip)
 * Extract and cd in
 * `./build.sh`
 
@@ -97,7 +97,6 @@ and the following optional features:
 
 * `page.evaluate_script` and `page.execute_script`
 * `page.within_frame`
-* `page.within_window`
 * `page.status_code`
 * `page.response_headers`
 * `page.save_screenshot`
@@ -105,6 +104,7 @@ and the following optional features:
 * `page.driver.scroll_to(left, top)`
 * `page.driver.basic_authorize(user, password)`
 * `element.native.send_keys(*keys)`
+* window API
 * cookie handling
 * drag-and-drop
 
@@ -131,11 +131,6 @@ If you need for some reasons base64 encoded screenshot you can simply call
 same as for `save_screenshot` except the first argument which is format (:png by
 default, acceptable :png, :gif, :jpeg).
 
-### Resizing the window ###
-
-Sometimes the window size is important to how things are rendered. Poltergeist sets the window
-size to 1024x768 by default, but you can set this yourself with `page.driver.resize(width, height)`.
-
 ### Clicking precise coordinates ###
 
 Sometimes its desirable to click a very specific area of the screen. You can accomplish this with
@@ -216,31 +211,7 @@ The following methods are used to inspect and manipulate cookies:
   `:secure`, `:httponly`, `:expires`. `:expires` should be a `Time`
   object.
 * `page.driver.remove_cookie(name)` - remove a cookie
-
-### Window switching ###
-
-The following methods can be used to execute commands inside different windows:
-
-* `page.driver.window_handles` - an array containing the names of all
-  the open windows.
-
-* `page.within_window(name) { # actions }` -  executes
-  the passed block in the context of the named window.
-
-Example:
-
-``` ruby
-find_link("Login with Facebook").trigger("click")
-
-sleep(0.1)
-
-fb_popup = page.driver.window_handles.last
-page.within_window fb_popup do
-  fill_in "email", :with => "facebook_email@email.tst"
-  fill_in "pass", :with => "my_pass"
-  click_button "Log In"
-end
-```
+* `page.driver.clear_cookies` - clear all cookies
 
 ### Sending keys ###
 
@@ -288,12 +259,12 @@ 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]
-*   `:phantomjs_options` (Array) - Additional [command line options](https://github.com/ariya/phantomjs/wiki/API-Reference)
+*   `: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
     the phantomjs browser. Useful for faking unsupported APIs.
 *   `:port` (Fixnum) - The port which should be used to communicate
-    with the PhantomJS process. Default: 44678.
+    with the PhantomJS process. Defaults to a random open port.
 
 ## Troubleshooting ##
 
@@ -309,7 +280,7 @@ occur sporadically and are not easily reproduced.
 
 If your crash happens every time, you should read the [PhantomJS crash
 reporting
-guide](https://github.com/ariya/phantomjs/wiki/Crash-Reporting) and file
+guide](http://phantomjs.org/crash-reporting.html) and file
 a bug against PhantomJS. Feel free to also file a bug against
 Poltergeist in case there are workarounds that can be implemented within
 Poltergeist. Also, if lots of Poltergeist users are experiencing the
@@ -412,7 +383,7 @@ the [changelog](CHANGELOG.md).
 
 ## License ##
 
-Copyright (c) 2011 Jonathan Leighton
+Copyright (c) 2011-2014 Jonathan Leighton
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/capybara/poltergeist/browser.rb

@@ -5,9 +5,11 @@ require 'time'
 module Capybara::Poltergeist
   class Browser
     ERROR_MAPPINGS = {
-      "Poltergeist.JavascriptError" => JavascriptError,
-      "Poltergeist.FrameNotFound"   => FrameNotFound,
-      "Poltergeist.InvalidSelector" => InvalidSelector
+      'Poltergeist.JavascriptError' => JavascriptError,
+      'Poltergeist.FrameNotFound'   => FrameNotFound,
+      'Poltergeist.InvalidSelector' => InvalidSelector,
+      'Poltergeist.StatusFailError' => StatusFailError,
+      'Poltergeist.NoSuchWindowError' => NoSuchWindowError
     }
 
     attr_reader :server, :client, :logger
@@ -49,6 +51,10 @@ module Capybara::Poltergeist
       command 'title'
     end
 
+    def parents(page_id, id)
+      command 'parents', page_id, id
+    end
+
     def find(method, selector)
       result = command('find', method, selector)
       result['ids'].map { |id| [result['page_id'], id] }
@@ -70,6 +76,10 @@ module Capybara::Poltergeist
       command 'delete_text', page_id, id
     end
 
+    def attributes(page_id, id)
+      command 'attributes', page_id, id
+    end
+
     def attribute(page_id, id, name)
       command 'attribute', page_id, id, name.to_s
     end
@@ -122,21 +132,45 @@ module Capybara::Poltergeist
       command 'pop_frame'
     end
 
+    def window_handle
+      command 'window_handle'
+    end
+
     def window_handles
-      command 'pages'
+      command 'window_handles'
+    end
+
+    def switch_to_window(handle)
+      command 'switch_to_window', handle
+    end
+
+    def open_new_window
+      command 'open_new_window'
+    end
+
+    def close_window(handle)
+      command 'close_window', handle
     end
 
     def within_window(name, &block)
-      command 'push_window', name
+      original = window_handle
+      handle = command 'window_handle', name
+      handle = name if handle.nil? && window_handles.include?(name)
+      raise NoSuchWindowError unless handle
+      switch_to_window(handle)
       yield
     ensure
-      command 'pop_window'
+      switch_to_window(original)
     end
 
     def click(page_id, id)
       command 'click', page_id, id
     end
 
+    def right_click(page_id, id)
+      command 'right_click', page_id, id
+    end
+
     def double_click(page_id, id)
       command 'double_click', page_id, id
     end
@@ -175,6 +209,10 @@ module Capybara::Poltergeist
       command 'render_base64', format.to_s, !!options[:full], options[:selector]
     end
 
+    def set_zoom_factor(zoom_factor)
+      command 'set_zoom_factor', zoom_factor
+    end
+
     def set_paper_size(size)
       command 'set_paper_size', size
     end
@@ -240,6 +278,10 @@ module Capybara::Poltergeist
       command 'remove_cookie', name
     end
 
+    def clear_cookies
+      command 'clear_cookies'
+    end
+
     def cookies_enabled=(flag)
       command 'cookies_enabled', !!flag
     end
@@ -258,17 +300,23 @@ module Capybara::Poltergeist
       end
     end
 
+    def url_blacklist=(blacklist)
+      command 'set_url_blacklist', *blacklist
+    end
+
     def debug=(val)
       @debug = val
       command 'set_debug', !!val
     end
 
     def command(name, *args)
-      message = { 'name' => name, 'args' => args }
-      log message.inspect
+      message = JSON.dump({ 'name' => name, 'args' => args })
+      log message
+
+      response = server.send(message)
+      log response
 
-      json = JSON.load(server.send(JSON.dump(message)))
-      log json.inspect
+      json = JSON.load(response)
 
       if json['error']
         klass = ERROR_MAPPINGS[json['error']['name']] || BrowserError

data/lib/capybara/poltergeist/client.rb

@@ -5,7 +5,7 @@ require 'cliver'
 module Capybara::Poltergeist
   class Client
     PHANTOMJS_SCRIPT  = File.expand_path('../client/compiled/main.js', __FILE__)
-    PHANTOMJS_VERSION = ['~> 1.8','>= 1.8.1']
+    PHANTOMJS_VERSION = ['>= 1.8.1', '< 3.0']
     PHANTOMJS_NAME    = 'phantomjs'
 
     KILL_TIMEOUT = 2 # seconds
@@ -99,13 +99,13 @@ module Capybara::Poltergeist
     # it works with JRuby but I've experienced strange mistakes on Rubinius.
     def redirect_stdout
       prev = STDOUT.dup
-      prev.autoclose = false
       $stdout = @write_io
       STDOUT.reopen(@write_io)
       yield
     ensure
       STDOUT.reopen(prev)
       $stdout = STDOUT
+      prev.close
     end
 
     def kill_phantomjs

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

@@ -25,7 +25,7 @@ class PoltergeistAgent
         throw error
 
   currentUrl: ->
-    encodeURI(window.location.href)
+    encodeURI(decodeURI(window.location.href))
 
   find: (method, selector, within = document) ->
     try
@@ -48,8 +48,8 @@ class PoltergeistAgent
     @elements.length - 1
 
   documentSize: ->
-    height: document.documentElement.scrollHeight,
-    width:  document.documentElement.scrollWidth
+    height: document.documentElement.scrollHeight || document.documentElement.clientHeight,
+    width:  document.documentElement.scrollWidth  || document.documentElement.clientWidth
 
   get: (id) ->
     @nodes[id] or= new PoltergeistAgent.Node(this, @elements[id])
@@ -65,6 +65,9 @@ class PoltergeistAgent
   afterUpload: (id) ->
     this.get(id).removeAttribute('_poltergeist_selected')
 
+  clearLocalStorage: ->
+    localStorage.clear()
+
 class PoltergeistAgent.ObsoleteNode
   toString: -> "PoltergeistAgent.ObsoleteNode"
 
@@ -75,7 +78,8 @@ class PoltergeistAgent.Node
   @EVENTS = {
     FOCUS: ['blur', 'focus', 'focusin', 'focusout'],
     MOUSE: ['click', 'dblclick', 'mousedown', 'mouseenter', 'mouseleave', 'mousemove',
-            'mouseover', 'mouseout', 'mouseup']
+            'mouseover', 'mouseout', 'mouseup', 'contextmenu'],
+    FORM: ['submit']
   }
 
   constructor: (@agent, @element) ->
@@ -83,6 +87,14 @@ class PoltergeistAgent.Node
   parentId: ->
     @agent.register(@element.parentNode)
 
+  parentIds: ->
+    ids = []
+    parent = @element.parentNode
+    while parent != document
+      ids.push @agent.register(parent)
+      parent = parent.parentNode
+    ids
+
   find: (method, selector) ->
     @agent.find(method, selector, @element)
 
@@ -136,17 +148,25 @@ class PoltergeistAgent.Node
     @element.textContent
 
   visibleText: ->
-    if @element.nodeName == "TEXTAREA"
-      @element.textContent
-    else
-      @element.innerText
+    if this.isVisible()
+      if @element.nodeName == "TEXTAREA"
+        @element.textContent
+      else
+        @element.innerText
 
   deleteText: ->
     range = document.createRange()
     range.selectNodeContents(@element)
+    window.getSelection().removeAllRanges()
     window.getSelection().addRange(range)
     window.getSelection().deleteFromDocument()
 
+  getAttributes: ->
+    attrs = {}
+    for attr, i in @element.attributes
+      attrs[attr.name] = attr.value.replace("\n","\\n");
+    attrs
+
   getAttribute: (name) ->
     if name == 'checked' || name == 'selected'
       @element[name]
@@ -219,6 +239,16 @@ class PoltergeistAgent.Node
   isDisabled: ->
     @element.disabled || @element.tagName == 'OPTION' && @element.parentNode.disabled
 
+  containsSelection: ->
+    selectedNode = document.getSelection().focusNode
+
+    return false if !selectedNode
+
+    if selectedNode.nodeType == 3
+      selectedNode = selectedNode.parentNode
+
+    @element.contains(selectedNode)
+
   frameOffset: ->
     win    = window
     offset = { top: 0, left: 0 }
@@ -257,13 +287,19 @@ class PoltergeistAgent.Node
         false, false, false, false, 0, null
       )
     else if Node.EVENTS.FOCUS.indexOf(name) != -1
-      event = document.createEvent('HTMLEvents')
-      event.initEvent(name, true, true)
+      event = this.obtainEvent(name)
+    else if Node.EVENTS.FORM.indexOf(name) != -1
+      event = this.obtainEvent(name)
     else
       throw "Unknown event"
 
     @element.dispatchEvent(event)
 
+  obtainEvent: (name) ->
+    event = document.createEvent('HTMLEvents')
+    event.initEvent(name, true, true)
+    event
+
   mouseEventTest: (x, y) ->
     frameOffset = this.frameOffset()