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
12 changes: 7 additions & 5 deletions common/src/web/service_worker.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
<head>
<title>Service Worker Test Page</title>
<script>
if (navigator.serviceWorker) {
navigator.serviceWorker.register("/service-worker.js", { scope: "/" })
.then(() => navigator.serviceWorker.ready)
.then(() => console.debug("[Companion]", "Service worker registered!"));
}
setTimeout(() => {
if (navigator.serviceWorker) {
navigator.serviceWorker.register("/service-worker.js", { scope: "/" })
.then(() => navigator.serviceWorker.ready)
.then(() => console.debug("[Companion]", "Service worker registered!"));
}
}, 100)
</script>
</head>
<body>
Expand Down
7 changes: 7 additions & 0 deletions rb/lib/selenium/webdriver/common/error.rb
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,13 @@ class TimeoutError < WebDriverError; end

class NoSuchWindowError < WebDriverError; end

#
# A command to find a devtools target could not be satisfied because
# the target could not be found.
#

class NoSuchTargetError < WebDriverError; end

#
# The element does not have a shadow root.
#
Expand Down
2 changes: 1 addition & 1 deletion rb/lib/selenium/webdriver/devtools.rb
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def respond_to_missing?(method, *_args)
def start_session(target_type:)
targets = target.get_targets.dig('result', 'targetInfos')
found_target = targets.find { |target| target['type'] == target_type }
raise Error::WebDriverError, "Target type '#{target_type}' not found" unless found_target
raise Error::NoSuchTargetError, "Target type '#{target_type}' not found" unless found_target

session = target.attach_to_target(target_id: found_target['targetId'], flatten: true)
@session_id = session.dig('result', 'sessionId')
Expand Down
5 changes: 3 additions & 2 deletions rb/spec/integration/selenium/webdriver/devtools_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,16 @@ module WebDriver

it 'target type is service_worker' do
driver.devtools.page.navigate(url: url_for('service_worker.html'))
sleep 0.5 # wait for service worker to register
wait_for_devtools_target(target_type: 'service_worker')

target = driver.devtools(target_type: 'service_worker').target
expect(target.get_target_info.dig('result', 'targetInfo', 'type')).to eq 'service_worker'
end

it 'throws an error for unknown target type' do
driver.devtools.page.navigate(url: url_for('xhtmlTest.html'))
expect { driver.devtools(target_type: 'unknown') }
.to raise_error(Selenium::WebDriver::Error::WebDriverError, "Target type 'unknown' not found")
.to raise_error(Selenium::WebDriver::Error::NoSuchTargetError, "Target type 'unknown' not found")
end
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@ def wait_for_new_url(old_url)
end
end

def wait_for_devtools_target(target_type:)
wait = Wait.new(timeout: 3, ignore: Error::NoSuchTargetError)
wait.until { driver.devtools(target_type: target_type).target }
end

def wait(timeout = 10)
Wait.new(timeout: timeout)
end
Expand Down