capybara-webkit 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efdcc01079f8576da25de8dff0b6c127170509e5
-  data.tar.gz: 48a04c108401162206fb5961fd2fa44fabd18e2d
+  metadata.gz: 8f6bbf1dc179252a2f808fee415bcf4f94f3b0e0
+  data.tar.gz: 320d1b94e5241d9aca6195f246487d018bc2d4d9
 SHA512:
-  metadata.gz: 234683f1ab1be1f2c7a1ddbdcac6c0389b705a385947e5a86d142b92d6317f6ad4e9fce7d19a55e07f398f3822bd1dcb214d92295301b74c38d72fb6479a6f1c
-  data.tar.gz: 9b6ad7da59e67012182e27044619b229674f961429cf272dc0c96298eac4fee1fd3aed74c15dbaf7c2db44b724b510b0a99542e9b0abbc7b87a8584b9fa66ce8
+  metadata.gz: cfe1194befdf9b3792390dab329ff59dab8ea834e132cf6d6c56d8f7a4df4748164593a5dd51c21c553b6a0c801f8bd6a9f0134b9b87d41a780c9a5d0dff75ff
+  data.tar.gz: 27309b5dcd287b804d83c97c64bcc9f11bdac110891160ace21bb908ab8b7b68b9691165c226e87a5d1d7fb5c5a180e49ded3f1f44c75e46b6e4e720f3f32127

data/.travis.yml

@@ -28,15 +28,15 @@ matrix:
       gemfile: gemfiles/2.7.gemfile
       env: QMAKE=/usr/lib/x86_64-linux-gnu/qt4/bin/qmake
     - rvm: 1.9.3
-      gemfile: gemfiles/2.11.gemfile
+      gemfile: gemfiles/2.12.gemfile
       env: QMAKE=/usr/lib/x86_64-linux-gnu/qt4/bin/qmake
-    - rvm: 2.3.1
+    - rvm: 2.3.3
       gemfile: gemfiles/master.gemfile
   allow_failures:
     - gemfile: gemfiles/master.gemfile
 gemfile:
   - gemfiles/2.7.gemfile
-  - gemfiles/2.11.gemfile
+  - gemfiles/2.12.gemfile
 before_install:
   - gem install bundler
 install: bundle

data/Appraisals

@@ -1,11 +1,12 @@
 appraise "2.7" do
   gem "capybara", "~> 2.7.0"
+  gem "rspec", "~> 2.14.0"
   gem 'addressable', '< 2.5.0', :platforms=>[:ruby_19, :jruby_19] # 2.5 requires public_suffix which requires ruby 2.0
   gem 'nokogiri', '< 1.7.0', :platforms=>[:ruby_19, :jruby_19] # 1.7.0 requires ruby 2.1+
 end
 
-appraise "2.11" do
-  gem "capybara", "~> 2.11.0"
+appraise "2.12" do
+  gem "capybara", "~> 2.12.0"
   gem 'addressable', '< 2.5.0', :platforms=>[:ruby_19, :jruby_19] # 2.5 requires public_suffix which requires ruby 2.0
   gem 'nokogiri', '< 1.7.0', :platforms=>[:ruby_19, :jruby_19] # 1.7.0 requires ruby 2.1+
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capybara-webkit (1.12.0)
+    capybara-webkit (1.13.0)
       capybara (>= 2.3.0, < 2.13.0)
       json
 
@@ -13,17 +13,17 @@ GEM
     appraisal (0.4.1)
       bundler
       rake
-    capybara (2.11.0)
+    capybara (2.12.0)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    diff-lcs (1.2.5)
-    ffi (1.9.14-java)
-    json (1.8.3)
-    json (1.8.3-java)
+    diff-lcs (1.3)
+    ffi (1.9.17-java)
+    json (1.8.6)
+    json (1.8.6-java)
     launchy (2.4.3)
       addressable (~> 2.3)
     launchy (2.4.3-java)
@@ -34,6 +34,9 @@ GEM
     mini_portile2 (2.1.0)
     nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
+    nokogiri (1.7.0.1-java)
+    nokogiri (1.7.0.1-x86-mingw32)
+      mini_portile2 (~> 2.1.0)
     public_suffix (2.0.5)
     rack (1.6.5)
     rack-protection (1.5.3)
@@ -41,21 +44,26 @@ GEM
     rack-test (0.6.3)
       rack (>= 1.0)
     rake (11.3.0)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.4)
-    sinatra (1.4.7)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    sinatra (1.4.8)
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
     spoon (0.0.6)
       ffi
-    tilt (2.0.5)
+    tilt (2.0.6)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -72,8 +80,8 @@ DEPENDENCIES
   mime-types (< 3.0)
   mini_magick
   rake (< 12.0.0)
-  rspec (~> 2.14)
+  rspec (~> 3.5)
   sinatra
 
 BUNDLED WITH
-   1.13.6
+   1.14.3

data/NEWS.md

@@ -1,3 +1,12 @@
+New for 1.13.0:
+
+* Allow JavaScript errors to be raised as Ruby exceptions
+(`config.raise_javascript_errors` option)
+
+New for 1.12.0:
+
+* Capybara 2.11 compatibility
+
 New for 1.11.1:
 
 * Fix compiling on OS X with Qt 4.8

data/README.md

@@ -129,6 +129,9 @@ Capybara::Webkit.configure do |config|
     user: "proxy",
     pass: "secret"
   )
+
+  # Raise JavaScript errors as exceptions
+  config.raise_javascript_errors = true
 end
 ```
 
@@ -206,7 +209,7 @@ The capybara WebKit driver is maintained by Joe Ferris and Matt Horan.
 Code for rendering the current webpage to a PNG is borrowed from Phantom.js'
 implementation.
 
-![thoughtbot](https://thoughtbot.com/logo.png)
+![thoughtbot](http://presskit.thoughtbot.com/images/thoughtbot-logo-for-readmes.svg)
 
 capybara-webkit is maintained and funded by thoughtbot, inc.
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.

data/capybara-webkit.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("capybara", ">= 2.3.0", "< 2.13.0")
   s.add_runtime_dependency("json")
 
-  s.add_development_dependency("rspec", "~> 2.14")
+  s.add_development_dependency("rspec", "~> 3.5")
   # Sinatra is used by Capybara's TestApp
   s.add_development_dependency("sinatra")
   s.add_development_dependency("mini_magick")

data/gemfiles/{2.11.gemfile → 2.12.gemfile}

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "mime-types", "< 3.0", :platforms=>[:ruby_19, :jruby_19]
 gem "json", "< 2.0", :platforms=>[:ruby_19, :jruby_19]
-gem "capybara", "~> 2.11.0"
+gem "capybara", "~> 2.12.0"
 gem "addressable", "< 2.5.0", :platforms=>[:ruby_19, :jruby_19]
 gem "nokogiri", "< 1.7.0", :platforms=>[:ruby_19, :jruby_19]
 

data/gemfiles/2.7.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "mime-types", "< 3.0", :platforms=>[:ruby_19, :jruby_19]
 gem "json", "< 2.0", :platforms=>[:ruby_19, :jruby_19]
 gem "capybara", "~> 2.7.0"
+gem "rspec", "~> 2.14.0"
 gem "addressable", "< 2.5.0", :platforms=>[:ruby_19, :jruby_19]
 gem "nokogiri", "< 1.7.0", :platforms=>[:ruby_19, :jruby_19]
 

data/lib/capybara/webkit/browser.rb

@@ -5,6 +5,7 @@ module Capybara::Webkit
   class Browser
     def initialize(connection)
       @connection = connection
+      apply_defaults
     end
 
     def authenticate(username, password)
@@ -36,6 +37,7 @@ module Capybara::Webkit
     end
 
     def reset!
+      apply_defaults
       command("Reset")
     end
 
@@ -99,6 +101,14 @@ module Capybara::Webkit
       command("SetSkipImageLoading", skip_image_loading)
     end
 
+    def set_raise_javascript_errors(is_enabled)
+      @raise_javascript_errors = is_enabled
+    end
+
+    def raise_javascript_errors?
+      @raise_javascript_errors
+    end
+
     def window_focus(selector)
       command("WindowFocus", selector)
     end
@@ -209,7 +219,9 @@ module Capybara::Webkit
         @connection.print arg.to_s
       end
       check
-      read_response
+      response = read_response
+      check_javascript_errors(name)
+      response
     rescue SystemCallError => exception
       @connection.restart
       raise(Capybara::Webkit::CrashError, <<-MESSAGE.strip)
@@ -295,6 +307,10 @@ https://github.com/thoughtbot/capybara-webkit/wiki/Reporting-Crashes
 
     private
 
+    def apply_defaults
+      @raise_javascript_errors = false
+    end
+
     def check
       result = @connection.gets
       result.strip! if result
@@ -308,6 +324,14 @@ https://github.com/thoughtbot/capybara-webkit/wiki/Reporting-Crashes
       result
     end
 
+    def check_javascript_errors(command_name)
+      return if command_name == "ConsoleMessages"
+
+      if raise_javascript_errors? && error_messages.any?
+        raise JavaScriptError, error_messages
+      end
+    end
+
     def read_response
       response_length = @connection.gets.to_i
       if response_length > 0

data/lib/capybara/webkit/configuration.rb

@@ -30,6 +30,7 @@ module Capybara
       attr_accessor :stderr
       attr_accessor :timeout
       attr_writer :skip_image_loading
+      attr_accessor :raise_javascript_errors
 
       def initialize
         @allowed_urls = []
@@ -41,6 +42,7 @@ module Capybara
         @skip_image_loading = false
         @stderr = $stderr
         @timeout = -1
+        @raise_javascript_errors = false
       end
 
       def allow_url(url)
@@ -93,7 +95,8 @@ module Capybara
           proxy: proxy,
           skip_image_loading: skip_image_loading?,
           stderr: stderr,
-          timeout: timeout
+          timeout: timeout,
+          raise_javascript_errors: raise_javascript_errors,
         }
       end
     end

data/lib/capybara/webkit/driver.rb

@@ -398,6 +398,10 @@ module Capybara::Webkit
         @browser.timeout = @options[:timeout]
       end
 
+      if @options.has_key? :raise_javascript_errors
+        @browser.set_raise_javascript_errors(@options[:raise_javascript_errors])
+      end
+
       Array(@options[:allowed_urls]).each { |url| @browser.allow_url(url) }
       Array(@options[:blocked_urls]).each { |url| @browser.block_url(url) }
     end

data/lib/capybara/webkit/errors.rb

@@ -44,4 +44,13 @@ module Capybara::Webkit
       Capybara::Webkit.const_get @class_name
     end
   end
+
+  class JavaScriptError < StandardError
+    def initialize(errors)
+      @javascript_errors = errors
+      super(errors.join(","))
+    end
+
+    attr_reader :javascript_errors
+  end
 end

data/lib/capybara/webkit/matchers.rb

@@ -7,11 +7,13 @@ module Capybara
           actual.error_messages.any?
         end
 
-        failure_message_for_should do |actual|
+        #RSpec 2 compatability
+        send(respond_to?(:failure_message) ? :failure_message : :failure_message_for_should) do |_actual|
           "Expected Javascript errors, but there were none."
         end
-        
-        failure_message_for_should_not do |actual|
+
+        #RSpec 2 compatability
+        send(respond_to?(:failure_message_when_negated) ? :failure_message_when_negated : :failure_message_for_should_not) do |actual|
           actual = resolve(actual)
           "Expected no Javascript errors, got:\n#{error_messages_for(actual)}"
         end

data/lib/capybara/webkit/node.rb

@@ -59,7 +59,7 @@ module Capybara::Webkit
         when String
           key.to_s
         else
-          raise Capybara::NotSupportedByDriverError.new
+          raise Capybara::NotSupportedByDriverError.new, "Unrecognized key(s) in #{key}"
         end
       }.join)
     end

data/lib/capybara/webkit/version.rb

@@ -1,7 +1,7 @@
 module Capybara
   module Driver
     class Webkit
-      VERSION = "1.12.0".freeze
+      VERSION = "1.13.0".freeze
     end
   end
 end

data/spec/browser_spec.rb

@@ -21,11 +21,9 @@ describe Capybara::Webkit::Browser do
   end
 
   it "doesn't try to read an empty response" do
-    connection = double("connection")
-    connection.stub(:puts)
-    connection.stub(:print)
-    connection.stub(:gets).and_return("ok\n", "0\n")
-    connection.stub(:read).and_raise(StandardError.new("tried to read empty response"))
+    connection = double("connection", puts: nil, print: nil)
+    allow(connection).to receive(:gets).and_return("ok\n", "0\n")
+    allow(connection).to receive(:read).and_raise(StandardError.new("tried to read empty response"))
 
     browser = Capybara::Webkit::Browser.new(connection)
 
@@ -37,12 +35,28 @@ describe Capybara::Webkit::Browser do
       it 'raises an error of given class' do
         error_json = '{"class": "ClickFailed"}'
 
-        connection.should_receive(:gets).ordered.and_return 'error'
-        connection.should_receive(:gets).ordered.and_return error_json.bytesize
-        connection.stub read: error_json
+        expect(connection).to receive(:gets).ordered.and_return 'error'
+        expect(connection).to receive(:gets).ordered.and_return error_json.bytesize
+        allow(connection).to receive(:read).and_return(error_json)
 
         expect { browser.command 'blah', 'meh' }.to raise_error(Capybara::Webkit::ClickFailed)
       end
     end
   end
+
+  describe "#reset!" do
+    it "resets to the default state" do
+      connection = double("connection", puts: nil, print: nil)
+      allow(connection).to receive(:gets).and_return("ok\n", "{}\n")
+
+      browser = Capybara::Webkit::Browser.new(connection)
+      browser.set_raise_javascript_errors(true)
+
+      expect(browser.raise_javascript_errors?).to be true
+
+      browser.reset!
+
+      expect(browser.raise_javascript_errors?).to be false
+    end
+  end
 end

data/spec/capybara_webkit_builder_spec.rb

@@ -6,25 +6,25 @@ describe CapybaraWebkitBuilder do
 
   it "will use the env variable for #make_bin" do
     with_env_vars("MAKE" => "fake_make") do
-      builder.make_bin.should == "fake_make"
+      expect(builder.make_bin).to eq "fake_make"
     end
   end
 
   it "will use the env variable for #qmake_bin" do
     with_env_vars("QMAKE" => "fake_qmake") do
-      builder.qmake_bin.should == "fake_qmake"
+      expect(builder.qmake_bin).to eq "fake_qmake"
     end
   end
 
   it "defaults the #make_bin" do
     with_env_vars("MAKE_BIN" => nil) do
-      builder.make_bin.should == 'make'
+      expect(builder.make_bin).to eq 'make'
     end
   end
 
   it "defaults the #qmake_bin" do
     with_env_vars("QMAKE" => nil) do
-      builder.qmake_bin.should == 'qmake'
+      expect(builder.qmake_bin).to eq 'qmake'
     end
   end
 end

data/spec/connection_spec.rb

@@ -5,13 +5,12 @@ describe Capybara::Webkit::Connection do
   it "sets appropriate options on its socket" do
     socket = double("socket")
     server = double(:Server, start: nil, port: 123)
-    TCPSocket.stub(:open).and_return(socket)
+    allow(TCPSocket).to receive(:open).and_return(socket)
     if defined?(Socket::TCP_NODELAY)
-      socket.
-        should_receive(:setsockopt).
+      expect(socket).to receive(:setsockopt).
         with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true)
     else
-      socket.should_not_receive(:setsockopt)
+      expect(socket).not_to receive(:setsockopt)
     end
 
     Capybara::Webkit::Connection.new(server: server)