watir-webdriver 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9c0e2e49fd1adf8c00dfc403d75c2e094fe1943
-  data.tar.gz: af1f8e6931a85648b791a7b1d63882366c4101b3
+  metadata.gz: e372a1f6959d978774865329265a8384bcb5392f
+  data.tar.gz: 62aa15e1de0949782b07234848810e9f1ada78d2
 SHA512:
-  metadata.gz: 7a25e42aefc24fa435a2b26d38cb37a9a21c00e65771c3454303b8799dbe39d3a00f1a1402841f59a5a6244843bd0c6f740e47e5c352a377a9f2a2ffeb9e44fd
-  data.tar.gz: 6f46fa5f3eb38248e74c3aaa75dd9d15240571cfcf13ad6df6dbf4ee3e178217029144e56fed72ca7fd45af4f6a8b3ff0873649283a87a51935dc9175082cf2a
+  metadata.gz: cf81b7db2c3f76b325aea31d4b200928ed210033c2017c0a777a8df8f5903841b35fb278ea1b0214bf955a1c1a8f28c25245d0801158388605f51c4577443e25
+  data.tar.gz: 90b8cba253f40574f08781ad83ca52220c3091c412d9dac432216377be2f74725c837b1092780259c40ba3a8d62a9de817bcf25fd01e3cdfc66c217a18310d4a

data/lib/watir-webdriver.rb

@@ -36,11 +36,11 @@ module Watir
     def always_locate=(bool)
       @always_locate = bool
     end
-    
+
     def default_timeout
       @default_timeout ||= 30
     end
-    
+
     #
     # Default wait time for wait methods.
     #

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

data/lib/watir-webdriver/wait.rb

@@ -9,7 +9,6 @@ module Watir
     INTERVAL = 0.1
 
     class << self
-
       #
       # Waits until the block evaluates to true or times out.
       #
@@ -23,7 +22,9 @@ module Watir
 
       def until(timeout = nil, message = nil, &block)
         timeout ||= Watir.default_timeout
-        wait(timeout) do
+        end_time = ::Time.now + timeout
+
+        until ::Time.now > end_time
           result = yield(self)
           return result if result
           sleep INTERVAL
@@ -45,7 +46,9 @@ module Watir
 
       def while(timeout = nil, message = nil, &block)
         timeout ||= Watir.default_timeout
-        wait(timeout) do
+        end_time = ::Time.now + timeout
+
+        until ::Time.now > end_time
           return unless yield(self)
           sleep INTERVAL
         end
@@ -62,10 +65,6 @@ module Watir
         err
       end
 
-      def wait(timeout, &block)
-        (timeout / INTERVAL).to_i.times &block
-      end
-
     end # self
   end # Wait
 

data/spec/browser_spec.rb

@@ -115,7 +115,7 @@ describe Watir::Browser do
   describe "#inspect" do
     it "works even if browser is closed" do
       browser.should_receive(:url).and_raise(Errno::ECONNREFUSED)
-      expect(browser.inspect).to_not raise_error
+      expect { browser.inspect }.to_not raise_error
     end
   end
 

data/support/travis.sh

@@ -4,7 +4,7 @@ set -e
 set -x
 
 export CHROME_REVISION=228611
-export CHROMEDRIVER_VERSION=2.4
+export CHROMEDRIVER_VERSION=2.9
 
 sh -e /etc/init.d/xvfb start
 git submodule update --init

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir-webdriver
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver