Skip to content

Commit fc37c9f

Browse files
authored
chore: pass wait_timeout and wait_interval (#346)
1 parent 1da3e75 commit fc37c9f

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

lib/appium_lib_core/common/base/driver.rb

+4
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ class Driver < ::Selenium::WebDriver::Driver
4848
attr_reader :bridge
4949

5050
def initialize(bridge: nil, listener: nil, **opts)
51+
# For ::Appium::Core::Waitable
52+
@wait_timeout = opts.delete(:wait_timeout)
53+
@wait_interval = opts.delete(:wait_interval)
54+
5155
super
5256
end
5357

lib/appium_lib_core/common/wait.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ module Waitable
154154
# @driver.wait_until_true(timeout: 30, interval: 2) { |d| driver.find_element :accessibility_id, 'something' }
155155
#
156156
def wait_until_true(timeout: nil, interval: nil, message: nil, ignored: nil, &block)
157-
Wait.until_true(timeout: timeout || @wait_timeout || ::Appium::Core::Wait::DEFAULT_TIMEOUT,
158-
interval: interval || @wait_interval || ::Appium::Core::Wait::DEFAULT_INTERVAL,
157+
Wait.until_true(timeout: timeout || @wait_timeout,
158+
interval: interval || @wait_interval,
159159
message: message,
160160
ignored: ignored,
161161
object: self,
@@ -190,8 +190,8 @@ def wait_until_true(timeout: nil, interval: nil, message: nil, ignored: nil, &bl
190190
# @driver.wait_until(timeout: 30, interval: 2) { |d| d.find_element :accessibility_id, 'something' }
191191
#
192192
def wait_until(timeout: nil, interval: nil, message: nil, ignored: nil, &block)
193-
Wait.until(timeout: timeout || @wait_timeout || ::Appium::Core::Wait::DEFAULT_TIMEOUT,
194-
interval: interval || @wait_interval || ::Appium::Core::Wait::DEFAULT_INTERVAL,
193+
Wait.until(timeout: timeout || @wait_timeout,
194+
interval: interval || @wait_interval,
195195
message: message,
196196
ignored: ignored,
197197
object: self,

lib/appium_lib_core/driver.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,9 @@ def start_driver(server_url: nil,
364364
@driver = ::Appium::Core::Base::Driver.new(listener: @listener,
365365
http_client: @http_client,
366366
capabilities: @caps, # ::Selenium::WebDriver::Remote::Capabilities
367-
url: @custom_url)
367+
url: @custom_url,
368+
wait_timeout: @wait_timeout,
369+
wait_interval: @wait_interval)
368370

369371
if @direct_connect
370372
d_c = DirectConnections.new(@driver.capabilities)

0 commit comments

Comments
 (0)