capybara-webkit 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 136473d447fe1a0b1d9f8885d80067fc93cbadf5
-  data.tar.gz: 1e397271112f1be272c0db39caeb4f2ee34e4e3d
+  metadata.gz: 566254149a5185cfd460a795c9edf23810cfdb48
+  data.tar.gz: f946fd8c9f1909a1a60422670aa7fa23ebac9891
 SHA512:
-  metadata.gz: cb3737cb219aef7fe7da7b9e3fd6ffdbcc52e6dc5ba3970edfa1186e209e6f93384e5ca210217a7ff6217c2d4803cc0f1dc1c51145af018627a46540c7ba0aa4
-  data.tar.gz: 534a003c460631a0804ce7edc9972d6a1812e001a3b060398cf2641621c1435104055e628976b812d34996681e9485b0ec4252d9c41f8a6803251b0775423aca
+  metadata.gz: f5971a9411cc36517d4eb7ad8a8c3143c825e514fd1b53e394e9fbbacac9b3b227430ef434401992408b3d46200d9a0c184d02b2c7c94bfac9bbc1023df566b1
+  data.tar.gz: f48aee4ab47ed6400d34526d7a19ad7fdb74dc340e2d42165401b04780e5d32d445cb115f396da6dfab281dcdc6c7f01c2a0390b34dce4b3f43f5c610fb054df

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capybara-webkit (1.7.0)
+    capybara-webkit (1.7.1)
       capybara (>= 2.3.0, < 2.6.0)
       json
 

data/NEWS.md

@@ -1,3 +1,7 @@
+New for 1.7.1:
+
+* Fix deprecation messages relating to default_wait_time
+
 New for 1.7.0:
 
 * Capybara 2.5 compatibility (except Node#send_keys)

data/README.md

@@ -101,10 +101,10 @@ Capybara::Webkit.configure do |config|
   # Allow pages to make requests to any URL without issuing a warning.
   config.allow_unknown_urls
 
-  # Allow a specifc domain without issuing a warning.
+  # Allow a specific domain without issuing a warning.
   config.allow_url("example.com")
 
-  # Allow a specifc URL and path without issuing a warning.
+  # Allow a specific URL and path without issuing a warning.
   config.allow_url("example.com/some/path")
 
   # Wildcards are allowed in URL expressions.

data/gemfiles/2.4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    capybara-webkit (1.7.0)
+    capybara-webkit (1.7.1)
       capybara (>= 2.3.0, < 2.6.0)
       json
 

data/gemfiles/2.5.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    capybara-webkit (1.7.0)
+    capybara-webkit (1.7.1)
       capybara (>= 2.3.0, < 2.6.0)
       json
 

data/lib/capybara/webkit/driver.rb

@@ -334,8 +334,12 @@ module Capybara::Webkit
       end.merge(original_text: options[:text])
     end
 
+    def default_wait_time
+      Capybara.respond_to?(:default_max_wait_time) ? Capybara.default_max_wait_time : Capybara.default_wait_time
+    end
+
     def find_modal(type, id, options)
-      Timeout::timeout(options[:wait] || Capybara.default_wait_time) do
+      Timeout::timeout(options[:wait] || default_wait_time) do
         @browser.find_modal(id)
       end
     rescue ModalNotFound

data/lib/capybara/webkit/version.rb

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

data/spec/integration/session_spec.rb

@@ -41,13 +41,12 @@ describe Capybara::Session do
       end
     end
 
-    before do
-      @default_wait_time = Capybara.default_wait_time
-      Capybara.default_wait_time = 1
+    around do |example|
+      Capybara.using_wait_time(1) do
+        example.run
+      end
     end
 
-    after { Capybara.default_wait_time = @default_wait_time }
-
     it "waits for a request to load" do
       subject.visit("/")
       subject.find_button("Submit").click
@@ -466,10 +465,9 @@ describe Capybara::Session do
 
     context "with wait time of 1 second" do
       around do |example|
-        default_wait_time = Capybara.default_wait_time
-        Capybara.default_wait_time = 1
-        example.run
-        Capybara.default_wait_time = default_wait_time
+        Capybara.using_wait_time(1) do
+          example.run
+        end
       end
 
       it "waits for an element to appear in the viewport when clicked" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webkit
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - thoughtbot
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-30 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara