don't create a query object just to get wait_time
This commit is contained in:
parent
d055a7ba1c
commit
f13a276f58
|
@ -8,8 +8,12 @@ module Capybara
|
|||
attr_reader :options
|
||||
|
||||
def wait
|
||||
if @options.has_key?(:wait)
|
||||
@options[:wait] || 0
|
||||
self.class.wait(options)
|
||||
end
|
||||
|
||||
def self.wait(options)
|
||||
if options.has_key?(:wait)
|
||||
options[:wait] || 0
|
||||
else
|
||||
Capybara.default_max_wait_time
|
||||
end
|
||||
|
|
|
@ -161,7 +161,7 @@ module Capybara
|
|||
|
||||
class BecomeClosed
|
||||
def initialize(options)
|
||||
@wait_time = Capybara::Queries::SelectorQuery.new(options).wait
|
||||
@wait_time = Capybara::Queries::BaseQuery.wait(options)
|
||||
end
|
||||
|
||||
def matches?(window)
|
||||
|
|
|
@ -439,7 +439,7 @@ module Capybara
|
|||
driver.switch_to_window(window.handle)
|
||||
window
|
||||
else
|
||||
wait_time = Capybara::Queries::SelectorQuery.new(options).wait
|
||||
wait_time = Capybara::Queries::BaseQuery.wait(options)
|
||||
document.synchronize(wait_time, errors: [Capybara::WindowError]) do
|
||||
original_window_handle = driver.current_window_handle
|
||||
begin
|
||||
|
@ -536,7 +536,7 @@ module Capybara
|
|||
old_handles = driver.window_handles
|
||||
block.call
|
||||
|
||||
wait_time = Capybara::Queries::SelectorQuery.new(options).wait
|
||||
wait_time = Capybara::Queries::BaseQuery.wait(options)
|
||||
document.synchronize(wait_time, errors: [Capybara::WindowError]) do
|
||||
opened_handles = (driver.window_handles - old_handles)
|
||||
if opened_handles.size != 1
|
||||
|
|
Loading…
Reference in New Issue