wist 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aa5f441eb74f8fae874d4e3493410d32fdb11a1
-  data.tar.gz: eea7f1657d43671176f1ce373daf62f0742d190e
+  metadata.gz: 10cca54a428e9d773cbae796707143783b12243b
+  data.tar.gz: 32c6af1c6f59d2728fc5432a96733ab171aca930
 SHA512:
-  metadata.gz: 565621550f29574538d051cbf9176682894b97a1379fc54914cdf26eb8a694bf856e49fdb28b7873346516163c595b22fd5505a7a0eba85ba0b6b611db3ddffb
-  data.tar.gz: 18b403d2a1634b5beb53e6bd54cda75ef42842ac2e4e6ddc740604f5467e14ae12e4bccfcb88dff8ecf7e06c9b512bc20e4c2a6c78532323f6ef365656a809e4
+  metadata.gz: 9b918cd234dfd215ff897054d2e492fec8cd4e665d4bebf385e5fda7dcc4e9c1d20c33c94256561ec785c861655393d510dd7a6ec1ee63a7e48a7630a668f6d3
+  data.tar.gz: ca47d1828c1a1d5754e13a593d4f9e6aa2b1d685cc6bd8a951ecf87528ca169e3b859de75a6d70f8060b9b081e0e8fb23c6d594738c8eb8b42f613876f896d9d

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org/'
 gemspec
 
-gem 'capybara', '2.4.4'
+gem 'capybara', '2.5.0'
 gem 'pry'
 gem 'rake'
 gem "poltergeist", "1.5.1"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wist (0.3.1)
+    wist (0.4.0)
       capybara
       selenium-webdriver
 
@@ -10,7 +10,7 @@ GEM
   specs:
     ansi (1.5.0)
     builder (3.2.2)
-    capybara (2.4.4)
+    capybara (2.5.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -22,7 +22,7 @@ GEM
     coderay (1.0.9)
     ffi (1.9.10)
     method_source (0.8.2)
-    mime-types (2.4.3)
+    mime-types (2.6.2)
     mini_portile (0.6.2)
     minitest (5.5.1)
     minitest-reporters (1.0.11)
@@ -42,13 +42,13 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rack (1.6.0)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
     rake (10.1.0)
     ruby-progressbar (1.7.1)
     rubyzip (1.1.7)
-    selenium-webdriver (2.46.2)
+    selenium-webdriver (2.47.1)
       childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
@@ -63,7 +63,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara (= 2.4.4)
+  capybara (= 2.5.0)
   minitest-reporters
   poltergeist (= 1.5.1)
   pry

data/lib/wist.rb

@@ -11,8 +11,16 @@ module Wist
     attr_accessor(:rspec_should)
     attr_accessor(:rspec_expect)
     attr_accessor(:assert_syntax_detected)
+    attr_accessor(:wait_time_method)
   end
 
+  self.wait_time_method = if defined?(Capybara.default_max_wait_time)
+    :default_max_wait_time
+  else
+    :default_wait_time
+  end
+
+
   module Helpers
     module_function
 
@@ -217,19 +225,23 @@ module Wist
     do_instantly { has_css?(*args) }
   end
 
+  def get_capybara_wait_time
+    Capybara.public_send(Wist.wait_time_method)
+  end
+
   def do_instantly
     lambda do
-      default_wait_time = Capybara.default_wait_time
-      @old_wait_time = default_wait_time if default_wait_time > 0
+      default_max_wait_time = get_capybara_wait_time
+      @old_wait_time = default_max_wait_time if default_max_wait_time > 0
     end.()
-    Capybara.default_wait_time = 0
+    Capybara.public_send("#{Wist.wait_time_method}=", 0)
 
     begin
       yield
     rescue => e
       raise(e)
     ensure
-      Capybara.default_wait_time = @old_wait_time
+      Capybara.public_send("#{Wist.wait_time_method}=", @old_wait_time)
     end
   end
 

data/test/tests/wist_test.rb

@@ -39,7 +39,7 @@ class WistTest < CapybaraTestCase
 
     wait_until(&wait_until_test(button))
     # make sure default wait time is back to normal
-    assert_equal(2, Capybara.default_wait_time)
+    assert_equal(2, get_capybara_wait_time)
   end
 
   def test_verify_tweet_button
@@ -193,19 +193,19 @@ class WistTest < CapybaraTestCase
   end
 
   def test_do_instantly
-    old_time = Capybara.default_wait_time
+    old_time = get_capybara_wait_time
     new_time = nil
 
     begin
       do_instantly do
-        new_time = Capybara.default_wait_time
+        new_time = get_capybara_wait_time
         raise
       end
     rescue
     end
 
     assert_equal(0, new_time)
-    assert_equal(old_time, Capybara.default_wait_time)
+    assert_equal(old_time, get_capybara_wait_time)
   end
 
   def test_interact_with_confirm

data/wist.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = 'wist'
-  gem.version  = '0.3.1'
+  gem.version  = '0.4.0'
   gem.summary  = 'capybara helpers'
   gem.author   = 'Lihan Li'
   gem.email    = 'frankieteardrop@gmail.com'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wist
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Lihan Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara