lib/watir/module.rb in watir-1.6.6 vs lib/watir/module.rb in watir-1.6.7.rc1

@@ -2,15 +2,13 @@
   include Watir::Exception
 
 # Directory containing the watir.rb file
   @@dir = File.expand_path(File.dirname(__FILE__))
 
-  ATTACHER = Waiter.new
 # Like regular Ruby "until", except that a TimeOutException is raised
 # if the timeout is exceeded. Timeout is IE.attach_timeout.
   def self.until_with_timeout # block
-    ATTACHER.timeout = IE.attach_timeout
-    ATTACHER.wait_until { yield }
+    Wait.until(IE.attach_timeout) { yield }
   end
 
   @@autoit = nil
 
   def self.autoit
\ No newline at end of file