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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
`Session with given id not found` or `Browser is dead or given window is closed` instead of starting on a fresh
page [#274], [rubycdp/ferrum#641]
- `Node#visible?` reported an open popover or modal dialog as hidden when an ancestor had `opacity: 0` [#328]
- `Driver#window_handles` listed the web workers a page spawned as windows, so `window_opened_by` raised
`opened 2 windows instead of 1` [#326]

### Removed

Expand Down
17 changes: 10 additions & 7 deletions lib/capybara/cuprite/browser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def window_handle
end

def window_handles
targets.keys
targets.values.select(&:page?).map(&:id)
end

def within_window(locator = nil)
Expand All @@ -124,17 +124,13 @@ def within_window(locator = nil)
end

def switch_to_window(target_id)
target = targets[target_id]
raise Ferrum::NoSuchPageError unless target

target = window_target(target_id)
@page = attach_page(target.id)
@page.activate
end

def close_window(target_id)
target = targets[target_id]
raise Ferrum::NoSuchPageError unless target

target = window_target(target_id)
@page = ClosedPage.new if @page.target_id == target.id
target.page.close
targets.delete(target_id) # page.close is async, delete target asap
Expand Down Expand Up @@ -298,6 +294,13 @@ def prepare_wildcards(patterns)
end
end

def window_target(target_id)
target = targets[target_id]
raise Ferrum::NoSuchPageError unless target&.page?

target
end

def attach_page(target_id = nil)
target = targets[target_id] if target_id
target ||= default_context.default_target
Expand Down
11 changes: 11 additions & 0 deletions spec/features/driver_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -989,6 +989,17 @@ def create_screenshot(file, *args)
expect(@driver.window_handles.size).to eq(2)
end

it "doesn't list web workers as windows" do
@session.visit "/cuprite/with_worker"

expect(@driver.window_handles.size).to eq(1)

new_window = @session.window_opened_by { @session.click_link "Open tab" }

expect(@driver.window_handles).to contain_exactly(@session.current_window.handle, new_window.handle)
@session.within_window(new_window) { expect(@session).to have_link("Open tab") }
end

context "a new window inherits settings" do
it "inherits size" do
@session.visit "/"
Expand Down
14 changes: 14 additions & 0 deletions spec/support/views/with_worker.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!DOCTYPE html>
<html>
<head>
<title>Worker</title>
</head>

<body>
<a href="/cuprite/with_worker" target="_blank">Open tab</a>
<script>
const blob = new Blob(["self.onmessage = () => {}"], { type: "text/javascript" });
new Worker(URL.createObjectURL(blob));
</script>
</body>
</html>
Loading