capybara-webkit 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb1c802882892f9e70e1b42d5b2f16bd01fbe99f
-  data.tar.gz: 8d803700aa341d54a6cb4a5e3016ab8afb0dbcf7
+  metadata.gz: 136473d447fe1a0b1d9f8885d80067fc93cbadf5
+  data.tar.gz: 1e397271112f1be272c0db39caeb4f2ee34e4e3d
 SHA512:
-  metadata.gz: cb8a7c5f7b5e29063d2fa241f38510797d26aefd9e3f112715b1d1c42028d169f954e869e445c8f8a4ee652e969e7972b67663774f579992c16346355383100f
-  data.tar.gz: 72b58214cdb532805b2ff63b7f8ff64342dc61a1faca858ee878f5ba5932839143785aef111ec00fa1ebb960fc8053ade23c4681a18c6f59e182c178d17a5e53
+  metadata.gz: cb3737cb219aef7fe7da7b9e3fd6ffdbcc52e6dc5ba3970edfa1186e209e6f93384e5ca210217a7ff6217c2d4803cc0f1dc1c51145af018627a46540c7ba0aa4
+  data.tar.gz: 534a003c460631a0804ce7edc9972d6a1812e001a3b060398cf2641621c1435104055e628976b812d34996681e9485b0ec4252d9c41f8a6803251b0775423aca

data/.travis.yml

@@ -14,14 +14,14 @@ env:
 matrix:
   include:
     - rvm: 1.9.3
-      gemfile: gemfiles/2.3.gemfile
+      gemfile: gemfiles/2.4.gemfile
       env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
     - rvm: 1.9.3
-      gemfile: gemfiles/2.4.gemfile
+      gemfile: gemfiles/2.5.gemfile
       env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
 gemfile:
-  - gemfiles/2.3.gemfile
   - gemfiles/2.4.gemfile
+  - gemfiles/2.5.gemfile
 before_install:
   - sh -c 'if [ -n "$QMAKE" ]; then sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa && sudo apt-get update && sudo apt-get install libqt5webkit5-dev qtdeclarative5-dev; fi'
 install: bundle

data/Appraisals

@@ -1,7 +1,7 @@
-appraise "2.3" do
-  gem "capybara", "~> 2.3.0"
-end
-
 appraise "2.4" do
   gem "capybara", "~> 2.4.0"
 end
+
+appraise "2.5" do
+  gem "capybara", "~> 2.5.0"
+end

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    capybara-webkit (1.6.0)
-      capybara (>= 2.3.0, < 2.5.0)
+    capybara-webkit (1.7.0)
+      capybara (>= 2.3.0, < 2.6.0)
       json
 
 GEM
@@ -12,7 +12,7 @@ GEM
     appraisal (0.4.0)
       bundler
       rake
-    capybara (2.4.4)
+    capybara (2.5.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -24,20 +24,20 @@ GEM
     ffi (1.9.8)
     ffi (1.9.8-java)
     ffi (1.9.8-x86-mingw32)
-    json (1.8.2)
+    json (1.8.3)
     launchy (2.4.2)
       addressable (~> 2.3)
     launchy (2.4.2-java)
       addressable (~> 2.3)
       spoon (~> 0.0.1)
-    mime-types (2.5)
+    mime-types (2.6.1)
     mini_magick (3.2.1)
       subexec (~> 0.0.4)
     mini_portile (0.6.2)
     multi_json (1.11.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    rack (1.5.2)
+    rack (1.6.4)
     rack-protection (1.3.2)
       rack
     rack-test (0.6.3)

data/NEWS.md

@@ -1,3 +1,8 @@
+New for 1.7.0:
+
+* Capybara 2.5 compatibility (except Node#send_keys)
+* Update UnknownUrlHandler warning to use non-deprecated methods
+
 New for 1.6.0:
 
 * New, easier, global configuration API.

data/capybara-webkit.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 1.9.0"
 
-  s.add_runtime_dependency("capybara", ">= 2.3.0", "< 2.5.0")
+  s.add_runtime_dependency("capybara", ">= 2.3.0", "< 2.6.0")
   s.add_runtime_dependency("json")
 
   s.add_development_dependency("rspec", "~> 2.14.0")

data/gemfiles/2.4.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ../
   specs:
-    capybara-webkit (1.5.0)
-      capybara (>= 2.3.0, < 2.5.0)
+    capybara-webkit (1.7.0)
+      capybara (>= 2.3.0, < 2.6.0)
       json
 
 GEM
@@ -22,7 +22,7 @@ GEM
       ffi (~> 1.0, >= 1.0.11)
     diff-lcs (1.2.5)
     ffi (1.9.8)
-    json (1.8.2)
+    json (1.8.3)
     launchy (2.4.2)
       addressable (~> 2.3)
     mime-types (2.4.3)

data/gemfiles/{2.3.gemfile → 2.5.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "capybara", "~> 2.3.0"
+gem "capybara", "~> 2.5.0"
 
 gemspec :path=>"../"

data/gemfiles/{2.3.gemfile.lock → 2.5.gemfile.lock}

@@ -1,43 +1,42 @@
 PATH
   remote: ../
   specs:
-    capybara-webkit (1.5.0)
-      capybara (>= 2.3.0, < 2.5.0)
+    capybara-webkit (1.7.0)
+      capybara (>= 2.3.0, < 2.6.0)
       json
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.6)
+    addressable (2.3.8)
     appraisal (0.4.1)
       bundler
       rake
-    capybara (2.3.0)
+    capybara (2.5.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.5.5)
+    childprocess (0.5.6)
       ffi (~> 1.0, >= 1.0.11)
     diff-lcs (1.2.5)
-    ffi (1.9.8)
-    json (1.8.2)
-    launchy (2.4.2)
+    ffi (1.9.10)
+    json (1.8.3)
+    launchy (2.4.3)
       addressable (~> 2.3)
-    mime-types (2.3)
-    mini_magick (3.7.0)
-      subexec (~> 0.2.1)
-    mini_portile (0.6.0)
-    multi_json (1.11.0)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
-    rack (1.5.2)
+    mime-types (2.6.1)
+    mini_magick (4.2.10)
+    mini_portile (0.6.2)
+    multi_json (1.11.2)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    rack (1.6.4)
     rack-protection (1.5.3)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -47,18 +46,17 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
     rubyzip (1.1.7)
-    selenium-webdriver (2.45.0)
+    selenium-webdriver (2.47.1)
       childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    sinatra (1.4.5)
+    sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    subexec (0.2.3)
-    tilt (1.4.1)
-    websocket (1.2.1)
+      tilt (>= 1.3, < 3)
+    tilt (2.0.1)
+    websocket (1.2.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -67,7 +65,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 0.4.0)
-  capybara (~> 2.3.0)
+  capybara (~> 2.5.0)
   capybara-webkit!
   launchy
   mini_magick

data/lib/capybara/webkit/version.rb

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

data/spec/spec_helper.rb

@@ -49,20 +49,10 @@ RSpec.configure do |c|
 
   # We can't support outerWidth and outerHeight without a visible window.
   # We focus the next window instead of failing when closing windows.
-  c.filter_run_excluding :full_description =>
-    /Capybara::Session webkit Capybara::Window #(size|resize_to|maximize|close.*no_such_window_error)/
-
-  # Capybara's integration tests expect "capybara/" in the default path
-  c.around :requires => :screenshot do |example|
-    old_path = Capybara.save_and_open_page_path
-    Capybara.save_and_open_page_path = File.join(PROJECT_ROOT, 'tmp', 'capybara')
-
-    begin
-      example.run
-    ensure
-    Capybara.save_and_open_page_path = old_path
-    end
-  end
+  # Node #send_keys is not yet implemented.
+  c.filter_run_excluding :full_description => lambda { |description, metadata|
+    description =~ /Capybara::Session webkit Capybara::Window #(size|resize_to|maximize|close.*no_such_window_error|send_keys)/ || description =~ /Capybara::Session webkit node #send_keys/
+  }
 end
 
 def with_env_vars(vars)

data/src/UnknownUrlHandler.cpp

@@ -24,11 +24,17 @@ QNetworkReply* UnknownUrlHandler::handleRequest(
         QTextStream(stderr) <<
            "Request to unknown URL: " << url.toString() << endl <<
            "To block requests to unknown URLs:" << endl <<
-           "  page.driver.block_unknown_urls" << endl <<
+           "  Capybara::Webkit.configure do |config|" << endl <<
+           "    config.block_unknown_urls" << endl <<
+           "  end" << endl <<
            "To allow just this URL:" << endl <<
-           "  page.driver.allow_url(\"" << url.toString() << "\")" << endl <<
+           "  Capybara::Webkit.configure do |config|" << endl <<
+           "    config.allow_url(\"" << url.toString() << "\")" << endl <<
+           "  end" << endl <<
            "To allow requests to URLs from this host:" << endl <<
-           "  page.driver.allow_url(\"" << url.host() << "\")" << endl;
+           "  Capybara::Webkit.configure do |config|" << endl <<
+           "    config.allow_url(\"" << url.host() << "\")" << endl <<
+           "  end" << endl;
         break;
       case BLOCK:
         return new NetworkReplyProxy(new NoOpReply(request), this);

data/src/capybara.js

@@ -330,6 +330,9 @@ Capybara = {
     var optionNode = this.getNode(index);
     var selectNode = optionNode.parentNode;
 
+    if (optionNode.disabled)
+      return;
+
     // click on select list
     this.triggerOnNode(selectNode, 'mousedown');
     selectNode.focus();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webkit
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - thoughtbot
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -24,7 +24,7 @@ dependencies:
         version: 2.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
         version: 2.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -170,10 +170,10 @@ files:
 - bin/Info.plist
 - capybara-webkit.gemspec
 - extconf.rb
-- gemfiles/2.3.gemfile
-- gemfiles/2.3.gemfile.lock
 - gemfiles/2.4.gemfile
 - gemfiles/2.4.gemfile.lock
+- gemfiles/2.5.gemfile
+- gemfiles/2.5.gemfile.lock
 - lib/capybara-webkit.rb
 - lib/capybara/webkit.rb
 - lib/capybara/webkit/browser.rb
@@ -397,24 +397,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Headless Webkit driver for Capybara
-test_files:
-- spec/browser_spec.rb
-- spec/capybara_webkit_builder_spec.rb
-- spec/configuration_spec.rb
-- spec/connection_spec.rb
-- spec/cookie_jar_spec.rb
-- spec/driver_rendering_spec.rb
-- spec/driver_resize_window_spec.rb
-- spec/driver_spec.rb
-- spec/errors_spec.rb
-- spec/integration/session_spec.rb
-- spec/selenium_compatibility_spec.rb
-- spec/self_signed_ssl_cert.rb
-- spec/spec_helper.rb
-- spec/support/app_runner.rb
-- spec/support/matchers/include_response.rb
-- spec/support/output_writer.rb
+test_files: []
+has_rdoc: