lib/watir-webdriver-rails/util/timeout.rb in watir-webdriver-rails-0.0.6 vs lib/watir-webdriver-rails/util/timeout.rb in watir-webdriver-rails-0.0.7

- old
+ new

@@ -1,24 +1,24 @@ -module WatirWebdriverRails - class << self - - # Copied from Capybara - def timeout(seconds = 1, driver = nil, error_message = nil, &block) - start_time = Time.now - - result = nil - - until result - return result if result = yield - - delay = seconds - (Time.now - start_time) - if delay <= 0 - raise TimeoutError, error_message || "timed out" - end - - driver && driver.wait_until(delay) - - sleep(0.05) - end - end - end +module WatirWebdriverRails + class << self + + # Copied from Capybara + def timeout(seconds = 1, driver = nil, error_message = nil, &block) + start_time = Time.now + + result = nil + + until result + return result if result = yield + + delay = seconds - (Time.now - start_time) + if delay <= 0 + raise TimeoutError, error_message || "timed out" + end + + driver && driver.wait_until(delay) + + sleep(0.05) + end + end + end end \ No newline at end of file