wist 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6150ba5406034ca7dede15c09f857706842af71
-  data.tar.gz: e56f65705c2f4b1b02c794fcc1b9430e145c70aa
+  metadata.gz: 0cc764cb16ae3e69fbd83e69683b71f3376624ef
+  data.tar.gz: e3cec4ee9c95beca47ff8998ed9d711deb2820c2
 SHA512:
-  metadata.gz: 7044443c1ce69637a1e89669076fc480251bcca91d781ac6d853b7dfdebb93389eacc89407d5070f43e3f57aa8d6c1a8015e9dbe747b6363ba06428a33b5c3e2
-  data.tar.gz: ced3cb4464579bc5a8be74f527a6f42e904fb29cb32ac3a20b09e817a156b2c1dfd9100dd586862e2c494600a483aee8246d96d6b8508297a32db5c893b14aaf
+  metadata.gz: 1c2162229c88a9cc9edf5258fbf7393066e9ec6bb5a1e8bf9c5503251d27687aab33dda8acda3dff39e5332380763f9bfc75fc21a00e42aeb00757132e16b48b
+  data.tar.gz: 5ac8dd9a14280305772a95e88f6388564857f5551a2cbf20b791ec07246abfeae35c030cb8050a7afc2f9b1734abe9c4fbf59a76167ce657c39dbc034f566116

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    wist (0.1.6)
+    wist (0.2.0)
       capybara
       selenium-webdriver
 

data/lib/wist.rb

@@ -16,18 +16,15 @@ module Wist
   end
 
   def wait_until(timeout: Capybara.default_wait_time)
-    old_timeout = Capybara.default_wait_time
-    Capybara.default_wait_time = 0
-
-    Selenium::WebDriver::Wait.new(timeout: timeout).until do
-      begin
-        yield
-      rescue
-        false
+    do_instantly do
+      Selenium::WebDriver::Wait.new(timeout: timeout).until do
+        begin
+          yield
+        rescue
+          false
+        end
       end
     end
-
-    Capybara.default_wait_time = old_timeout
   end
 
   def click(selector)
@@ -170,6 +167,19 @@ module Wist
   end
 
   def has_css_instant?(selector)
-    page.evaluate_script("$('#{selector}:visible').length > 0")
+    do_instantly { has_css?(selector) }
+  end
+
+  def do_instantly
+    old_time = Capybara.default_wait_time
+    Capybara.default_wait_time = 0
+
+    begin
+      yield
+    rescue => e
+      raise(e)
+    ensure
+      Capybara.default_wait_time = old_time
+    end
   end
 end

data/test/tests/wist_test.rb

@@ -165,4 +165,20 @@ class WistTest < CapybaraTestCase
     assert_equal(true, has_css_instant?('body'))
     assert_equal(false, has_css_instant?('#sdklfjk'))
   end
+
+  def test_do_instantly
+    old_time = Capybara.default_wait_time
+    new_time = nil
+
+    begin
+      do_instantly do
+        new_time = Capybara.default_wait_time
+        raise
+      end
+    rescue
+    end
+
+    assert_equal(0, new_time)
+    assert_equal(old_time, Capybara.default_wait_time)
+  end
 end

data/wist.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = 'wist'
-  gem.version  = '0.1.6'
+  gem.version  = '0.2.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.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Lihan Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara