capybara-webkit 0.13.2 → 0.14.0

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: rbx-19mode
+notifications:
+  email: false
+script: xvfb-run rake

data/Gemfile.lock

@@ -1,36 +1,38 @@
 PATH
   remote: .
   specs:
-    capybara-webkit (0.13.2)
-      capybara (>= 1.0.0, < 1.2)
+    capybara-webkit (0.14.0)
+      capybara (~> 2.0, >= 2.0.2)
       json
 
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.2)
     appraisal (0.4.0)
       bundler
       rake
-    capybara (1.1.2)
+    capybara (2.0.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.3.9)
-      ffi (~> 1.0, >= 1.0.11)
+      xpath (~> 1.0.0)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
     diff-lcs (1.1.2)
-    ffi (1.9.0)
-    json (1.8.0)
-    mime-types (1.23)
+    ffi (1.2.0)
+    json (1.7.6)
+    libwebsocket (0.1.7.1)
+      addressable
+      websocket
+    mime-types (1.19)
     mini_magick (3.2.1)
       subexec (~> 0.0.4)
-    mini_portile (0.5.1)
-    multi_json (1.7.8)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    rack (1.3.2)
+    multi_json (1.5.0)
+    nokogiri (1.5.6)
+    rack (1.4.1)
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (0.9.2)
@@ -43,18 +45,18 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     rubyzip (0.9.9)
-    selenium-webdriver (2.33.0)
+    selenium-webdriver (2.27.2)
       childprocess (>= 0.2.5)
+      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-      websocket (~> 1.0.4)
     sinatra (1.1.2)
       rack (~> 1.1)
       tilt (~> 1.2)
     subexec (0.0.4)
     tilt (1.2.2)
-    websocket (1.0.7)
-    xpath (0.1.4)
+    websocket (1.0.6)
+    xpath (1.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS

data/NEWS.md

@@ -1,4 +1,23 @@
-New for HEAD:
+New for 0.14.0:
+
+* URL blacklist support.
+* Various fixes for JavaScript console messages.
+* Various compilation fixes.
+* Fix status code and headers commands for iframes.
+* Capybara 2.0 compatibility.
+* Driver#render replaced by Session#save_screenshot.
+* Driver#source and Driver#body return the HTML representation of the DOM.  Unsupported content is returned as plain text.
+* HTML5 multi-file upload support.
+* Driver#url and Driver#requested_url removed.
+* JavaScipt console messages and alerts are now written to the logger instead of directly to stdout.
+* Dropped support for Qt 4.7.
+* Fix deadlocks encountered during page load.
+* Delete Response objects when commands have timed out.
+* Fix an infinite loop when invalid credentials are used for HTTP auth.
+* Ensure queued commands start only after pending commands have finished.
+* Fix segfaults related to web fonts on OS X.
+
+New for 0.13.0:
 
 * Better detect page load success, and better handle load failures.
 * HTTP Basic Auth support.

data/README.md

@@ -1,22 +1,24 @@
 capybara-webkit
 ===============
 
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/thoughtbot/capybara-webkit)
+[![Build Status](https://secure.travis-ci.org/thoughtbot/capybara-webkit.png?branch=master)](https://travis-ci.org/thoughtbot/capybara-webkit) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/thoughtbot/capybara-webkit)
 
 A [capybara](https://github.com/jnicklas/capybara) driver that uses [WebKit](http://webkit.org) via [QtWebKit](http://doc.qt.nokia.com/4.7/qtwebkit.html).
 
 Qt Dependency and Installation Issues
--------------
+-------------------------------------
 
 capybara-webkit depends on a WebKit implementation from Qt, a cross-platform
 development toolkit. You'll need to download the Qt libraries to build and
 install the gem. You can find instructions for downloading and installing QT on
-the [capybara-webkit wiki](https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit)
+the
+[capybara-webkit wiki](https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit).
+capybara-webkit requires Qt version 4.8.
 
 Windows Support
 ---------------
 
-Currently 32bit Windows will compile Capybara-webkit. Support for Windows is provided by the open source community and Windows related issues should be posted to the [mailing list](http://groups.google.com/group/capybara-webkit)
+Currently 32-bit Windows will compile capybara-webkit. Support for Windows is provided by the open source community and Windows related issues should be posted to the [mailing list](http://groups.google.com/group/capybara-webkit)
 
 Reporting Issues
 ----------------
@@ -53,7 +55,7 @@ Set your Capybara Javascript driver to webkit:
 
 In cucumber, tag scenarios with @javascript to run them using a headless WebKit browser.
 
-In RSpec, use the :js => true flag. See the [capybara documention](http://rubydoc.info/gems/capybara#Using_Capybara_with_RSpec) for more information about using capybara with RSpec.
+In RSpec, use the `:js => true` flag. See the [capybara documention](http://rubydoc.info/gems/capybara#Using_Capybara_with_RSpec) for more information about using capybara with RSpec.
 
 Take note of the transactional fixtures section of the [capybara README](https://github.com/jnicklas/capybara/blob/master/README.md).
 
@@ -99,10 +101,6 @@ capybara-webkit supports a few methods that are not part of the standard capybar
     page.driver.evaluate_script("window.innerWidth")
     => 500
 
-**render**: render a screenshot of the current view (requires [mini_magick](https://github.com/probablycorey/mini_magick) and [ImageMagick](http://www.imagemagick.org))
-
-    page.driver.render "tmp/screenshot.png"
-
 **cookies**: allows read-only access of cookies for the current session
 
     page.driver.cookies["alpha"]
@@ -171,6 +169,10 @@ capybara-webkit supports a few methods that are not part of the standard capybar
     page.driver.console_messages.first[:message]
     => "42"
 
+**header**: set the given HTTP header for subsequent requests
+
+    page.driver.header 'Referer', 'https://www.thoughtbot.com'
+
 Contributing
 ------------
 
@@ -179,7 +181,7 @@ See the CONTRIBUTING document.
 About
 -----
 
-The capybara WebKit driver is maintained by Joe Ferris and Matt Mongeau. It was written by [thoughtbot, inc](http://thoughtbot.com/community) with the help of numerous [contributions from the open source community](https://github.com/thoughtbot/capybara-webkit/contributors).
+The capybara WebKit driver is maintained by Joe Ferris and Matt Horan. It was written by [thoughtbot, inc](http://thoughtbot.com/community) with the help of numerous [contributions from the open source community](https://github.com/thoughtbot/capybara-webkit/contributors).
 
 Code for rendering the current webpage to a PNG is borrowed from Phantom.js' implementation.
 

data/capybara-webkit.gemspec

@@ -4,7 +4,8 @@ require "capybara/webkit/version"
 Gem::Specification.new do |s|
   s.name     = "capybara-webkit"
   s.version  = Capybara::Driver::Webkit::VERSION.dup
-  s.authors  = ["thoughtbot", "Joe Ferris", "Matt Mongeau", "Mike Burns", "Jason Morrison"]
+  s.authors  = ["thoughtbot", "Joe Ferris", "Matt Horan", "Matt Mongeau",
+                "Mike Burns", "Jason Morrison"]
   s.email    = "support@thoughtbot.com"
   s.homepage = "http://github.com/thoughtbot/capybara-webkit"
   s.summary  = "Headless Webkit driver for Capybara"
@@ -15,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.extensions = "extconf.rb"
 
-  s.add_runtime_dependency("capybara", [">= 1.0.0", "< 1.2"])
+  s.add_runtime_dependency("capybara", "~> 2.0", ">= 2.0.2")
   s.add_runtime_dependency("json")
 
   s.add_development_dependency("rspec", "~> 2.6.0")

data/lib/capybara/webkit/browser.rb

@@ -34,18 +34,13 @@ module Capybara::Webkit
       command("Body")
     end
 
-    def source
-      command("Source")
-    end
-
     def status_code
       command("Status").to_i
     end
 
     def console_messages
-      command("ConsoleMessages").split("\n").map do |messages|
-        parts = messages.split("|", 3)
-        { :source => parts.first, :line_number => Integer(parts[1]), :message => parts.last }
+      JSON.parse(command("ConsoleMessages")).map do |message|
+        message.inject({}) { |m,(k,v)| m.merge(k.to_sym => v) }
       end
     end
 
@@ -56,29 +51,21 @@ module Capybara::Webkit
     end
 
     def alert_messages
-      command("JavascriptAlertMessages").split("\n")
+      JSON.parse(command("JavascriptAlertMessages"))
     end
 
     def confirm_messages
-      command("JavascriptConfirmMessages").split("\n")
+      JSON.parse(command("JavascriptConfirmMessages"))
     end
 
     def prompt_messages
-      command("JavascriptPromptMessages").split("\n")
+      JSON.parse(command("JavascriptPromptMessages"))
     end
 
     def response_headers
       Hash[command("Headers").split("\n").map { |header| header.split(": ") }]
     end
 
-    def url
-      command("Url")
-    end
-
-    def requested_url
-      command("RequestedUrl")
-    end
-
     def current_url
       command("CurrentUrl")
     end
@@ -141,6 +128,10 @@ module Capybara::Webkit
       command("ClearPromptText")
     end
 
+    def url_blacklist=(black_list)
+      command("SetUrlBlacklist", *Array(black_list))
+    end
+
     def command(name, *args)
       @connection.puts name
       @connection.puts args.size
@@ -209,7 +200,7 @@ module Capybara::Webkit
       elsif result != 'ok'
         case response = read_response
         when "timeout"
-          raise Capybara::TimeoutError, "Request timed out after #{timeout_seconds}"
+          raise Timeout::Error, "Request timed out after #{timeout_seconds}"
         else
           raise InvalidResponseError, response
         end

data/lib/capybara/webkit/connection.rb

@@ -1,6 +1,7 @@
 require 'socket'
 require 'timeout'
 require 'thread'
+require 'open3'
 
 module Capybara::Webkit
   class Connection
@@ -11,8 +12,7 @@ module Capybara::Webkit
 
     def initialize(options = {})
       @socket_class = options[:socket_class] || TCPSocket
-      @stdout = options.has_key?(:stdout) ?  options[:stdout] : $stdout
-      @command = options[:command] || SERVER_PATH
+      @output_target = options.has_key?(:stdout) ? options[:stdout] : $stdout
       start_server
       connect
     end
@@ -38,12 +38,12 @@ module Capybara::Webkit
     def start_server
       open_pipe
       discover_port
-      forward_stdout_in_background_thread
+      forward_output_in_background_thread
     end
 
     def open_pipe
-      @pipe = IO.popen(@command)
-      @pid = @pipe.pid
+      _, @pipe_stdout, @pipe_stderr, wait_thr = Open3.popen3(SERVER_PATH)
+      @pid = wait_thr[:pid]
       register_shutdown_hook
     end
 
@@ -65,40 +65,19 @@ module Capybara::Webkit
     end
 
     def discover_port
-      if IO.select([@pipe], nil, nil, WEBKIT_SERVER_START_TIMEOUT)
-        @port = ((@pipe.first || '').match(/listening on port: (\d+)/) || [])[1].to_i
+      if IO.select([@pipe_stdout], nil, nil, WEBKIT_SERVER_START_TIMEOUT)
+        @port = ((@pipe_stdout.first || '').match(/listening on port: (\d+)/) || [])[1].to_i
       end
     end
 
-    def forward_stdout_in_background_thread
-      @stdout_thread = Thread.new do
+    def forward_output_in_background_thread
+      Thread.new do
         Thread.current.abort_on_exception = true
-        forward_stdout
+        IO.copy_stream(@pipe_stdout, @output_target)
       end
-    end
-
-    def forward_stdout
-      while pipe_readable?
-        line = @pipe.readline
-        if @stdout
-          @stdout.write(line)
-          @stdout.flush
-        end
-      end
-    rescue EOFError
-    end
-
-    if !defined?(RUBY_ENGINE) || (RUBY_ENGINE == "ruby" && RUBY_VERSION <= "1.8")
-      # please note the use of IO::select() here, as it is used specifically to
-      # preserve correct signal handling behavior in ruby 1.8.
-      # https://github.com/thibaudgg/rb-fsevent/commit/d1a868bf8dc72dbca102bedbadff76c7e6c2dc21
-      # https://github.com/thibaudgg/rb-fsevent/blob/1ca42b987596f350ee7b19d8f8210b7b6ae8766b/ext/fsevent/fsevent_watch.c#L171
-      def pipe_readable?
-        IO.select([@pipe])
-      end
-    else
-      def pipe_readable?
-        !@pipe.eof?
+      Thread.new do
+        Thread.current.abort_on_exception = true
+        IO.copy_stream(@pipe_stderr, @output_target)
       end
     end
 

data/lib/capybara/webkit/driver.rb

@@ -14,8 +14,6 @@ module Capybara::Webkit
     def initialize(app, options={})
       @app = app
       @options = options
-      @rack_server = Capybara::Server.new(@app)
-      @rack_server.boot if Capybara.run_server
       @browser = options[:browser] || Browser.new(Connection.new(options))
     end
 
@@ -27,23 +25,15 @@ module Capybara::Webkit
       browser.current_url
     end
 
-    def requested_url
-      browser.requested_url
-    end
-
     def visit(path)
-      browser.visit(url(path))
+      browser.visit(path)
     end
 
     def find(query)
       browser.find(query).map { |native| Node.new(self, native) }
     end
 
-    def source
-      browser.source
-    end
-
-    def body
+    def html
       browser.body
     end
 
@@ -147,7 +137,8 @@ module Capybara::Webkit
       true
     end
 
-    def wait_until(*args)
+    def needs_server?
+      true
     end
 
     def reset!
@@ -158,17 +149,13 @@ module Capybara::Webkit
       false
     end
 
-    def render(path, options={})
+    def save_screenshot(path, options={})
       options[:width]  ||= 1000
       options[:height] ||= 10
 
       browser.render path, options[:width], options[:height]
     end
 
-    def server_port
-      @rack_server.port
-    end
-
     def cookies
       @cookie_jar ||= CookieJar.new(browser)
     end
@@ -178,9 +165,5 @@ module Capybara::Webkit
     end
 
     private
-
-    def url(path)
-      @rack_server.url(path)
-    end
   end
 end

data/lib/capybara/webkit/node.rb

@@ -12,7 +12,11 @@ module Capybara::Webkit
       if name == 'checked' || name == 'disabled' || name == 'multiple'
         value == 'true'
       else
-        value
+        if invoke("hasAttribute", name) == 'true'
+          value
+        else
+          nil
+        end
       end
     end
 
@@ -33,7 +37,7 @@ module Capybara::Webkit
     end
 
     def set(value)
-      invoke "set", value
+      invoke "set", *[value].flatten
     end
 
     def select_option
@@ -122,5 +126,9 @@ module Capybara::Webkit
     def multiple_select?
       self.tag_name == "select" && self["multiple"]
     end
+
+    def ==(other)
+      invoke("equals", other.native) == "true"
+    end
   end
 end