lib/rufus.rb in rufus-0.8.1 vs lib/rufus.rb in rufus-0.8.2

@@ -1,48 +1,34 @@
 require 'rufus/navigation'
 require 'rufus/accessors/accessors'
 require 'rufus/accessors/view'
 require 'rufus/accessors/table'
+require 'rufus/waiter'
 
 module Rufus
 
   def self.included(cls)
     cls.extend Rufus::Accessors
   end
 
   def exists_after_wait?(view, timeout = 5)
-    wait = Selenium::WebDriver::Wait.new :timeout => timeout
-    begin
-      wait.until{view.exists?}
-    rescue Selenium::WebDriver::Error::TimeOutError
-      return false
-    end
-    true
+    wait = Rufus::Waiter.new selenium, :timeout => timeout
+    wait.until{view.exists?}
   end
 
   def displayed_after_wait?(view, timeout = 5)
-    wait = Selenium::WebDriver::Wait.new :timeout => timeout
-    begin
-      wait.until{view.displayed?}
-    rescue Selenium::WebDriver::Error::TimeOutError
-      return false
-    end
-    true
+    wait = Rufus::Waiter.new selenium, :timeout => timeout
+    wait.until{view.displayed?}
   end
 
   def enabled_after_wait?(view, timeout = 5)
-    wait = Selenium::WebDriver::Wait.new :timeout => timeout
-    begin
-      wait.until{view.enabled?}
-    rescue Selenium::WebDriver::Error::TimeOutError
-      return false
-    end
-    true
+    wait = Rufus::Waiter.new selenium, :timeout => timeout
+    wait.until{view.enabled?}
   end
 
   def enabled_hash_after_wait?(locator, timeout = 5)
-    element = find locator
-    enabled_after_wait? element, timeout
+    view = Rufus::Accessors::View.new locator
+    enabled_after_wait? view, timeout
   end
 
   def exists_hash_after_wait?(locator, timeout = 5)
     view = Rufus::Accessors::View.new locator
     exists_after_wait? view, timeout