capybara-webkit 0.7.2 → 0.8.0

data/CONTRIBUTING.md

@@ -3,7 +3,7 @@ We love pull requests. Here's a quick guide:
 1. Fork the repo.
 
 2. Run the tests. We only take pull requests with passing tests, and it's great
-to know that you have a clean slate: `bundle && rake`
+to know that you have a clean slate: `bundle && bundle exec rake`
 
 3. Add a test for your change. Only refactoring and documentation changes
 require no new tests. If you are adding functionality or fixing a bug, we need

data/Gemfile

@@ -1,8 +1,3 @@
 source "http://rubygems.org"
+
 gemspec
-# gem "appraisal"
-# gem "rspec", '~> 2.6.0', :require => false
-# gem "capybara"
-# gem "sinatra", :require => false
-# gem "mini_magick", :require => false
-# gem 'rake'

data/Gemfile.lock

@@ -1,30 +1,32 @@
 PATH
   remote: .
   specs:
-    capybara-webkit (0.7.2)
-      capybara (< 1.2, >= 1.0.0)
+    capybara-webkit (0.8.0)
+      capybara (>= 1.0.0, < 1.2)
+      json
 
 GEM
   remote: http://rubygems.org/
   specs:
-    appraisal (0.3.8)
+    appraisal (0.4.0)
       bundler
       rake
-    capybara (1.1.1)
+    capybara (1.1.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.2.2)
+    childprocess (0.2.3)
       ffi (~> 1.0.6)
     diff-lcs (1.1.2)
-    ffi (1.0.9)
-    json_pure (1.6.1)
-    mime-types (1.16)
+    ffi (1.0.11)
+    json (1.6.3)
+    mime-types (1.17.2)
     mini_magick (3.2.1)
       subexec (~> 0.0.4)
+    multi_json (1.0.4)
     nokogiri (1.5.0)
     rack (1.3.2)
     rack-test (0.6.1)
@@ -38,11 +40,11 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    rubyzip (0.9.4)
-    selenium-webdriver (2.7.0)
+    rubyzip (0.9.5)
+    selenium-webdriver (2.15.0)
       childprocess (>= 0.2.1)
-      ffi (>= 1.0.7)
-      json_pure
+      ffi (~> 1.0.9)
+      multi_json (~> 1.0.4)
       rubyzip
     sinatra (1.1.2)
       rack (~> 1.1)
@@ -56,7 +58,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal
+  appraisal (~> 0.4.0)
   capybara-webkit!
   mini_magick
   rake

data/README.md

@@ -15,11 +15,13 @@ Reporting Issues
 ----------------
 
 Without access to your application code we can't easily debug most crashes or
-generic failures, so we've included a debug vesion of the driver that prints a
+generic failures, so we've included a debug version of the driver that prints a
 log of what happened during each test. Before filing a crash bug, please see
 [Reporting Crashes](https://github.com/thoughtbot/capybara-webkit/wiki/Reporting-Crashes).
 You're much more likely to get a fix if you follow those instructions.
 
+If you are having compiling issues please post to the [mailing list](http://groups.google.com/group/capybara-webkit).
+
 CI
 --
 
@@ -38,7 +40,11 @@ Set your Capybara Javascript driver to webkit:
 
     Capybara.javascript_driver = :webkit
 
-Tag scenarios with @javascript to run them using a headless WebKit browser.
+In cucumber, tag scenarios with @javascript to run them using a headless WebKit browser.
+
+In RSpec, use the :js => true flag.
+
+Take note of the transactional fixtures section of the [capybara README](https://github.com/jnicklas/capybara/blob/master/README.md).
 
 Contributing
 ------------
@@ -48,7 +54,7 @@ See the CONTRIBUTING document.
 About
 -----
 
-The capybara WebKit driver was written by Joe Ferris, Tristan Dunn, and Jason Morrison from [thoughtbot, inc](http://thoughtbot.com/community).
+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).
 
 Code for rendering the current webpage to a PNG is borrowed from Phantom.js' implementation.
 
@@ -56,11 +62,6 @@ Code for rendering the current webpage to a PNG is borrowed from Phantom.js' imp
 
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 
-Notes
------
-
-capybara-webkit will listen on port 8200. This may conflict with other services.
-
 License
 -------
 

data/Rakefile

@@ -1,10 +1,10 @@
-require 'rubygems'
-require 'bundler/setup'
+require 'bundler'
 require 'rspec/core/rake_task'
-require 'rake/gempackagetask'
 require 'capybara_webkit_builder'
 require 'appraisal'
 
+Bundler::GemHelper.install_tasks
+
 desc "Generate a Makefile using qmake"
 file 'Makefile' do
   CapybaraWebkitBuilder.makefile or exit(1)
@@ -30,24 +30,6 @@ end
 desc "Default: build and run all specs"
 task :default => [:build, :spec]
 
-eval("$specification = begin; #{IO.read('capybara-webkit.gemspec')}; end")
-Rake::GemPackageTask.new($specification) do |package|
-  package.need_zip = true
-  package.need_tar = true
-end
-
-gem_file = "pkg/#{$specification.name}-#{$specification.version}.gem"
-
-desc "Build and install the latest gem"
-task :install => :gem do
-  sh("gem install --local #{gem_file}")
-end
-
-desc "Build and release the latest gem"
-task :release => :gem do
-  sh("gem push #{gem_file}")
-end
-
 desc "Generate a new command called NAME"
 task :generate_command do
   name = ENV['NAME'] or raise "Provide a name with NAME="

data/capybara-webkit.gemspec

@@ -1,24 +1,27 @@
+$:.push File.expand_path("../lib", __FILE__)
+require "capybara/driver/webkit/version"
+
 Gem::Specification.new do |s|
-  s.name = "capybara-webkit"
-  s.version = "0.7.2"
-  s.authors = ["thoughtbot", "Joe Ferris", "Jason Morrison", "Tristan Dunn",
-               "Joshua Clayton", "Yuichi Tateno", "Aaron Gibralter",
-               "Vasily Reys", "petrushka", "John Bintz", "Chad Pytel",
-               "Christopher Meiklejohn", "John Barker", "Jeremy Wells",
-               "Chris Griego", "Shigeya Suzuki"]
-  s.email = "support@thoughtbot.com"
-  s.files = `git ls-files`.split("\n")
-  s.test_files = `git ls-files -- {spec,features}/*`.split("\n")
+  s.name     = "capybara-webkit"
+  s.version  = Capybara::Driver::Webkit::VERSION.dup
+  s.authors  = ["thoughtbot", "Joe Ferris", "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"
+
+  s.files        = `git ls-files`.split("\n")
+  s.test_files   = `git ls-files -- {spec,features}/*`.split("\n")
   s.require_path = "lib"
-  s.rubygems_version = "1.3.5"
-  s.summary = "Headless Webkit driver for Capybara"
-  s.add_runtime_dependency "capybara", [">= 1.0.0", "< 1.2"]
-  s.add_development_dependency "rspec", "~> 2.6.0"
-  s.add_development_dependency "sinatra"
-  s.add_development_dependency "mini_magick"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "appraisal"
+
   s.extensions = "extconf.rb"
+
+  s.add_runtime_dependency("capybara", [">= 1.0.0", "< 1.2"])
+  s.add_runtime_dependency("json")
+
+  s.add_development_dependency("rspec", "~> 2.6.0")
+  s.add_development_dependency("sinatra")
+  s.add_development_dependency("mini_magick")
+  s.add_development_dependency("rake")
+  s.add_development_dependency("appraisal", "~> 0.4.0")
 end
 

data/gemfiles/1.0.gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: /Users/jferris/Source/capybara-webkit
   specs:
-    capybara-webkit (0.6.1)
-      capybara (< 1.2, >= 1.0.0)
+    capybara-webkit (0.8.0)
+      capybara (>= 1.0.0, < 1.2)
+      json
 
 GEM
   remote: http://rubygems.org/
   specs:
-    appraisal (0.3.8)
+    appraisal (0.4.0)
       bundler
       rake
     capybara (1.0.1)
@@ -20,16 +21,19 @@ GEM
     childprocess (0.2.2)
       ffi (~> 1.0.6)
     diff-lcs (1.1.3)
-    ffi (1.0.9)
+    ffi (1.0.10)
+    json (1.6.3)
     json_pure (1.6.1)
-    mime-types (1.16)
+    mime-types (1.17.2)
     mini_magick (3.3)
       subexec (~> 0.1.0)
     nokogiri (1.5.0)
-    rack (1.3.3)
+    rack (1.3.5)
+    rack-protection (1.1.4)
+      rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -39,14 +43,15 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     rubyzip (0.9.4)
-    selenium-webdriver (2.7.0)
+    selenium-webdriver (2.12.1)
       childprocess (>= 0.2.1)
-      ffi (>= 1.0.7)
+      ffi (~> 1.0.9)
       json_pure
       rubyzip
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (< 2.0, >= 1.2.2)
+    sinatra (1.3.1)
+      rack (~> 1.3, >= 1.3.4)
+      rack-protection (~> 1.1, >= 1.1.2)
+      tilt (~> 1.3, >= 1.3.3)
     subexec (0.1.0)
     tilt (1.3.3)
     xpath (0.1.4)
@@ -56,7 +61,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal
+  appraisal (~> 0.4.0)
   capybara (~> 1.0.0)
   capybara-webkit!
   mini_magick

data/gemfiles/1.1.gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: /Users/jferris/Source/capybara-webkit
   specs:
-    capybara-webkit (0.6.1)
-      capybara (< 1.2, >= 1.0.0)
+    capybara-webkit (0.8.0)
+      capybara (>= 1.0.0, < 1.2)
+      json
 
 GEM
   remote: http://rubygems.org/
   specs:
-    appraisal (0.3.8)
+    appraisal (0.4.0)
       bundler
       rake
     capybara (1.1.1)
@@ -20,16 +21,19 @@ GEM
     childprocess (0.2.2)
       ffi (~> 1.0.6)
     diff-lcs (1.1.3)
-    ffi (1.0.9)
+    ffi (1.0.10)
+    json (1.6.3)
     json_pure (1.6.1)
-    mime-types (1.16)
+    mime-types (1.17.2)
     mini_magick (3.3)
       subexec (~> 0.1.0)
     nokogiri (1.5.0)
-    rack (1.3.3)
+    rack (1.3.5)
+    rack-protection (1.1.4)
+      rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -39,14 +43,15 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     rubyzip (0.9.4)
-    selenium-webdriver (2.7.0)
+    selenium-webdriver (2.12.1)
       childprocess (>= 0.2.1)
-      ffi (>= 1.0.7)
+      ffi (~> 1.0.9)
       json_pure
       rubyzip
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (< 2.0, >= 1.2.2)
+    sinatra (1.3.1)
+      rack (~> 1.3, >= 1.3.4)
+      rack-protection (~> 1.1, >= 1.1.2)
+      tilt (~> 1.3, >= 1.3.3)
     subexec (0.1.0)
     tilt (1.3.3)
     xpath (0.1.4)
@@ -56,7 +61,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal
+  appraisal (~> 0.4.0)
   capybara (~> 1.1.0)
   capybara-webkit!
   mini_magick

data/lib/capybara/driver/webkit.rb

@@ -1,7 +1,9 @@
 require "capybara"
+require "capybara/driver/webkit/version"
 require "capybara/driver/webkit/node"
 require "capybara/driver/webkit/browser"
 require "capybara/driver/webkit/socket_debugger"
+require "capybara/driver/webkit/cookie_jar"
 
 class Capybara::Driver::Webkit
   class WebkitInvalidResponseError < StandardError
@@ -20,13 +22,18 @@ class Capybara::Driver::Webkit
     @options = options
     @rack_server = Capybara::Server.new(@app)
     @rack_server.boot if Capybara.run_server
-    @browser = options[:browser] || Browser.new
+    @browser = options[:browser] || Browser.new(
+      :ignore_ssl_errors => options[:ignore_ssl_errors])
   end
 
   def current_url
     browser.url
   end
 
+  def requested_url
+    browser.requested_url
+  end
+
   def visit(path)
     browser.visit(url(path))
   end
@@ -56,6 +63,14 @@ class Capybara::Driver::Webkit
     browser.evaluate_script script
   end
 
+  def console_messages
+    browser.console_messages
+  end
+
+  def error_messages
+    browser.error_messages
+  end
+
   def response_headers
     browser.response_headers
   end
@@ -103,6 +118,10 @@ class Capybara::Driver::Webkit
     @rack_server.port
   end
 
+  def cookies
+    @cookie_jar ||= CookieJar.new(browser)
+  end
+
   private
 
   def url(path)

data/lib/capybara/driver/webkit/browser.rb

@@ -12,6 +12,7 @@ class Capybara::Driver::Webkit
       @stdout       = options.has_key?(:stdout) ?
                         options[:stdout] :
                         $stdout
+      @ignore_ssl_errors = options[:ignore_ssl_errors]
       start_server
       connect
     end
@@ -44,6 +45,19 @@ class Capybara::Driver::Webkit
       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 }
+      end
+    end
+
+    def error_messages
+      console_messages.select do |message|
+        message[:message] =~ /Error:/
+      end
+    end
+
     def response_headers
       Hash[command("Headers").split("\n").map { |header| header.split(": ") }]
     end
@@ -52,6 +66,10 @@ class Capybara::Driver::Webkit
       command("Url")
     end
 
+    def requested_url
+      command("RequestedUrl")
+    end
+
     def frame_focus(frame_id_or_index=nil)
       if frame_id_or_index.is_a? Fixnum
         command("FrameFocus", "", frame_id_or_index.to_s)
@@ -98,6 +116,15 @@ class Capybara::Driver::Webkit
       command("GetCookies").lines.map{ |line| line.strip }.select{ |line| !line.empty? }
     end
 
+    def set_proxy(options = {})
+      options = default_proxy_options.merge(options)
+      command("SetProxy", options[:host], options[:port], options[:user], options[:pass])
+    end
+
+    def clear_proxy
+      command("SetProxy")
+    end
+
     private
 
     def start_server
@@ -111,16 +138,24 @@ class Capybara::Driver::Webkit
 
     def fork_server
       server_path = File.expand_path("../../../../../bin/webkit_server", __FILE__)
-
       pipe, @pid = server_pipe_and_pid(server_path)
-
-      at_exit { Process.kill("INT", @pid) }
-
+      register_shutdown_hook
       pipe
     end
 
+    def register_shutdown_hook
+      @owner_pid = Process.pid
+      at_exit do
+        if Process.pid == @owner_pid
+          Process.kill("INT", @pid)
+        end
+      end
+    end
+
     def server_pipe_and_pid(server_path)
-      pipe = IO.popen(server_path)
+      cmdline = [server_path]
+      cmdline << "--ignore-ssl-errors" if @ignore_ssl_errors
+      pipe = IO.popen(cmdline.join(" "))
       [pipe, pipe.pid]
     end
 
@@ -185,5 +220,14 @@ class Capybara::Driver::Webkit
       response.force_encoding("UTF-8") if response.respond_to?(:force_encoding)
       response
     end
+
+    def default_proxy_options
+      {
+        :host => "localhost",
+        :port => "0",
+        :user => "",
+        :pass => ""
+      }
+    end
   end
 end