wist 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cc764cb16ae3e69fbd83e69683b71f3376624ef
-  data.tar.gz: e3cec4ee9c95beca47ff8998ed9d711deb2820c2
+  metadata.gz: cc61f2c9e1bbd38709007f5da04f7245ecbb7eea
+  data.tar.gz: 73d64f0a71e5cc0e23ad92a03123a8054d0ff140
 SHA512:
-  metadata.gz: 1c2162229c88a9cc9edf5258fbf7393066e9ec6bb5a1e8bf9c5503251d27687aab33dda8acda3dff39e5332380763f9bfc75fc21a00e42aeb00757132e16b48b
-  data.tar.gz: 5ac8dd9a14280305772a95e88f6388564857f5551a2cbf20b791ec07246abfeae35c030cb8050a7afc2f9b1734abe9c4fbf59a76167ce657c39dbc034f566116
+  metadata.gz: 924060310a5fc0beaaeb89e75306d2c254e439126bd09f6d849d832d8f586510532ac8b8c9f2096e2244e1603c080acae08c7087b7cec7a3b36e6412ca52f2d1
+  data.tar.gz: 861deace2eeea2ccbb7a3686f86160064fa855ca26c1ccdd11d268f9347910dff50529737776adf0ee0864d798acca4eaa54ba2140303792ff98a867105af9b6

data/Gemfile.lock

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

data/lib/wist.rb

@@ -15,9 +15,9 @@ module Wist
     end
   end
 
-  def wait_until(timeout: Capybara.default_wait_time)
+  def wait_until(timeout: false)
     do_instantly do
-      Selenium::WebDriver::Wait.new(timeout: timeout).until do
+      Selenium::WebDriver::Wait.new(timeout: timeout || @old_wait_time).until do
         begin
           yield
         rescue
@@ -171,7 +171,10 @@ module Wist
   end
 
   def do_instantly
-    old_time = Capybara.default_wait_time
+    lambda do
+      default_wait_time = Capybara.default_wait_time
+      @old_wait_time = default_wait_time if default_wait_time > 0
+    end.()
     Capybara.default_wait_time = 0
 
     begin
@@ -179,7 +182,7 @@ module Wist
     rescue => e
       raise(e)
     ensure
-      Capybara.default_wait_time = old_time
+      Capybara.default_wait_time = @old_wait_time
     end
   end
 end

data/test/test.css

@@ -1,3 +1,3 @@
 #test_scroll_to {
-  margin-top: 1000px;
+  margin-top: 5000px;
 }

data/test/tests/wist_test.rb

@@ -10,22 +10,34 @@ class WistTest < CapybaraTestCase
     assert current_path.match(/test#{num}.html$/)
   end
 
+  def wait_until_test(button)
+    lambda do
+      raise unless button.text == 'clicked'
+      true
+    end
+  end
+
   # tests
   def test_click
     click '#click_test'
     assert_equal 'clicked', find('#click_test').text
   end
 
-  def test_wait_until
+  def test_wait_until_nested
     button = find('#wait_test')
     button.click
-    assert button.text != 'clicked'
 
     wait_until do
-      raise unless button.text == 'clicked'
-      true
+      wait_until(&wait_until_test(button))
     end
+  end
+
+  def test_wait_until
+    button = find('#wait_test')
+    button.click
+    assert(button.text != 'clicked')
 
+    wait_until(&wait_until_test(button))
     # make sure default wait time is back to normal
     assert_equal(2, Capybara.default_wait_time)
   end

data/wist.gemspec

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

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: wist
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Lihan Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -44,7 +44,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -70,18 +70,26 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: capybara helpers
-test_files: []
+test_files:
+- test/jquery.cookie.js
+- test/jquery.js
+- test/test.css
+- test/test.js
+- test/test0.html
+- test/test1.html
+- test/test_helper.rb
+- test/tests/wist_test.rb