Permalink
Browse files

Remove Watir.until_with_timeout. Use Watir::Wait.until instead.

  • Loading branch information...
1 parent aed96dc commit d5d0c184f32d52b34821618f701792f44365fa7c @jarmo jarmo committed Aug 19, 2012
Showing with 2 additions and 11 deletions.
  1. +1 −1 lib/watir-classic/modal_dialog.rb
  2. +1 −10 lib/watir-classic/module.rb
@@ -13,7 +13,7 @@ def locate
@modal.wait_until_present rescue raise NoMatchingWindowFoundException
intUnknown = 0
- Watir::until_with_timeout do
+ Wait.until do
intPointer = " " * 4 # will contain the int value of the IUnknown*
GetUnknown.call(hwnd, intPointer)
intArray = intPointer.unpack('L')
@@ -1,12 +1,3 @@
module Watir
include Watir::Exception
-
-# Directory containing the watir.rb file
- @@dir = File.expand_path(File.dirname(__FILE__))
-
-# Like regular Ruby "until", except that a Wait::TimeoutError is raised
-# if the timeout is exceeded. Timeout is IE.attach_timeout.
- def self.until_with_timeout # block
- Wait.until(IE.attach_timeout) { yield }
- end
-end
+end

0 comments on commit d5d0c18

Please sign in to comment.