watir-webdriver 0.2.0.dev → 0.2.0.dev2

data/Rakefile

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

data/lib/watir-webdriver/browser.rb

@@ -8,6 +8,7 @@ module Watir
   class Browser
     include Container
     include WindowSwitching
+    include Waitable
 
     attr_reader :driver
     alias_method :wd, :driver # ensures duck typing with Watir::Element
@@ -122,10 +123,10 @@ module Watir
     def add_checker(checker = nil, &block)
       if block_given?
         @error_checkers << block
-      elsif Proc === checker
+      elsif checker.respond_to? :call
         @error_checkers << checker
       else
-        raise ArgumentError, "argument must be a Proc or block"
+        raise ArgumentError, "expected block or object responding to #call"
       end
     end
 
@@ -134,7 +135,7 @@ module Watir
     end
 
     def run_checkers
-      @error_checkers.each { |e| e[self] }
+      @error_checkers.each { |e| e.call(self) }
     end
 
     #
@@ -155,6 +156,7 @@ module Watir
     def exist?
       not @closed
     end
+    alias_method :exists?, :exist?
 
     def browser
       self

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.2.0.dev"
+  VERSION = "0.2.0.dev2"
 end

data/lib/watir-webdriver/wait.rb

@@ -1,11 +1,12 @@
 # encoding: utf-8
 module Watir
-
   module Wait
 
     class TimeoutError < StandardError
     end
 
+    INTERVAL = 0.1
+
     class << self
       #
       # Wait until the block evaluates to true or times out.
@@ -17,7 +18,7 @@ module Watir
         until ::Time.now > end_time
           result = yield(self)
           return result if result
-          sleep 0.5
+          sleep INTERVAL
         end
 
         raise TimeoutError, message_for(timeout, message)
@@ -32,7 +33,7 @@ module Watir
 
         until ::Time.now > end_time
           return unless yield(self)
-          sleep 0.5
+          sleep INTERVAL
         end
 
         raise TimeoutError, message_for(timeout, message)
@@ -49,6 +50,16 @@ module Watir
     end # class << self
   end # Wait
 
+  module Waitable
+    def wait_until(*args, &blk)
+      Wait.until(*args, &blk)
+    end
+
+    def wait_while(*args, &blk)
+      Wait.while(*args, &blk)
+    end
+  end
+
   #
   # Wraps an Element so that any subsequent method calls are
   # put on hold until the element is present (exists and is visible) on the page.

data/lib/watir-webdriver/window_switching.rb

@@ -1,9 +1,6 @@
 module Watir
   module WindowSwitching
 
-    class NoMatchingWindowFoundException < StandardError
-    end
-
     def windows(*args)
       all = @driver.window_handles.map { |handle| Window.new(@driver, :handle => handle) }
 
@@ -62,7 +59,7 @@ module Watir
     def exists?
       handle
       true
-    rescue NoMatchingWindowFoundException
+    rescue Exception::NoMatchingWindowFoundException
       false
     end
     alias_method :present?, :exists? # for Wait::EventuallyPresent
@@ -122,7 +119,7 @@ module Watir
         matches?(handle)
       }
 
-      handle or raise NoMatchingWindowFoundException, @selector.inspect
+      handle or raise Exception::NoMatchingWindowFoundException, @selector.inspect
     end
 
     def matches?(handle)

data/spec/browser_spec.rb

@@ -76,4 +76,26 @@ describe Watir::Browser do
     end
   end
 
+  describe "#wait_while" do
+    it "delegates to the Wait module" do
+      Wait.should_receive(:while).with(3, "foo").and_yield
+
+      called = false
+      browser.wait_while(3, "foo") { called = true }
+
+      called.should be_true
+    end
+  end
+
+  describe "#wait_until" do
+    it "delegates to the Wait module" do
+      Wait.should_receive(:until).with(3, "foo").and_yield
+
+      called = false
+      browser.wait_until(3, "foo") { called = true }
+
+      called.should be_true
+    end
+  end
+
 end

data/spec/wait_spec.rb

@@ -71,7 +71,9 @@ describe Watir::Element do
     it "times out when not given a block" do
       lambda {
         browser.div(:id, 'bar').when_present(1).click
-      }.should raise_error(Watir::Wait::TimeoutError, 'timed out after 1 seconds, waiting for {:id=>"bar", :tag_name=>"div"} to become present')
+      }.should raise_error(Watir::Wait::TimeoutError, 
+        /^timed out after 1 seconds, waiting for (\{:id=>"bar", :tag_name=>"div"\}|\{:tag_name=>"div", :id=>"bar"\}) to become present$/
+      )
     end
   end
 
@@ -84,7 +86,9 @@ describe Watir::Element do
     it "times out if the element doesn't appear" do
       lambda do
         browser.div(:id, 'bar').wait_until_present(1)
-      end.should raise_error(Watir::Wait::TimeoutError, 'timed out after 1 seconds, waiting for {:id=>"bar", :tag_name=>"div"} to become present')
+      end.should raise_error(Watir::Wait::TimeoutError, 
+        /^timed out after 1 seconds, waiting for (\{:id=>"bar", :tag_name=>"div"\}|\{:tag_name=>"div", :id=>"bar"\}) to become present$/
+      )
     end
   end
 
@@ -102,7 +106,9 @@ describe Watir::Element do
     it "times out" do
       lambda do
         browser.div(:id, 'foo').wait_while_present(1)
-      end.should raise_error(Watir::Wait::TimeoutError, 'timed out after 1 seconds, waiting for {:id=>"foo", :tag_name=>"div"} to disappear')
+      end.should raise_error(Watir::Wait::TimeoutError, 
+        /^timed out after 1 seconds, waiting for (\{:id=>"foo", :tag_name=>"div"\}|\{:tag_name=>"div", :id=>"foo"\}) to disappear$/
+      )
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: watir-webdriver
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.2.0.dev
+  version: 0.2.0.dev2
 platform: ruby
 authors: 
 - Jari Bakken
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 +01:00
+date: 2011-02-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency