Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion rb/lib/selenium/webdriver/common/wait.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ def initialize(opts = {})
@timeout = opts.fetch(:timeout, DEFAULT_TIMEOUT)
@interval = opts.fetch(:interval, DEFAULT_INTERVAL)
@message = opts[:message]
@ignored = Array(opts[:ignore] || Error::NoSuchElementError)
@message_provider = opts[:message_provider]
@ignored = Array(opts[:ignore] || Error::NoSuchElementError)
end

#
Expand All @@ -64,6 +65,8 @@ def until

msg = if @message
@message.dup
elsif @message_provider
@message_provider.call
else
"timed out after #{@timeout} seconds"
end
Expand Down
20 changes: 7 additions & 13 deletions rb/spec/integration/selenium/webdriver/devtools_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -100,26 +100,20 @@ module WebDriver

it 'notifies about log messages' do
logs = []
driver.on_log_event(:console) { |log| logs.push(log) }
driver.on_log_event(:console) { |log| logs.push(log.args[0]) }
driver.navigate.to url_for('javascriptPage.html')

driver.execute_script("console.log('I like cheese');")
sleep 0.5
driver.execute_script('console.log(true);')
sleep 0.5
driver.execute_script('console.log(null);')
sleep 0.5
driver.execute_script('console.log(undefined);')
sleep 0.5
driver.execute_script('console.log(document);')
sleep 0.5
driver.execute_script("console.log('I like cheese');")

expect(logs).to include(
an_object_having_attributes(type: :log, args: ['I like cheese']),
an_object_having_attributes(type: :log, args: [true]),
an_object_having_attributes(type: :log, args: [nil]),
an_object_having_attributes(type: :log, args: [{'type' => 'undefined'}])
)
wait.until { logs.include?('I like cheese') }

expect(logs).to include(true)
expect(logs).to include(nil)
expect(logs).to include({'type' => 'undefined'})
end

it 'notifies about document log messages' do
Expand Down
Loading