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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

### Changed
- Ferrum is bumped to `~> 0.19.0`
- Change `Node#send_keys` to avoid triggering `click` on an already focused element. `send_keys(:tab)` without an
element no longer clicks the middle of the page first, so Tab moves focus from the start of the page, and Capybara's
`#active_element` and `focused:` specs run in the suite [#327]

### Fixed
- `window_size: nil` raised `Ferrum::BrowserError: Invalid parameters` on every page instead of leaving the window
Expand Down
4 changes: 4 additions & 0 deletions lib/capybara/cuprite/javascripts/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,10 @@ class Cuprite {
window.getSelection().deleteFromDocument();
}

hasFocus(node) {
return document.activeElement === node;
}

containsSelection(node) {
let selectedNode = document.getSelection().focusNode;

Expand Down
2 changes: 1 addition & 1 deletion lib/capybara/cuprite/page.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def hover(node)
end

def send_keys(node, keys)
unless evaluate_on(node: node, expression: %(_cuprite.containsSelection(this)))
unless evaluate_on(node: node, expression: %(_cuprite.containsSelection(this) || _cuprite.hasFocus(this)))
before_click(node, "click")
node.click(mode: :left, keys: keys)
end
Expand Down
4 changes: 4 additions & 0 deletions spec/features/driver_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1450,13 +1450,17 @@ def create_screenshot(file, *args)

it "sends keys to the active_element" do
@session.find_field("empty_input").execute_script("this.focus()")
@session.find_field("empty_input").execute_script <<~JS
this.addEventListener("click", () => window.clickedBeforeFocus = true)
JS

expect(@session).to have_field("empty_input", focused: true)

@session.send_keys(:tab)

expect(@session).to have_field("empty_input", focused: false)
.and(have_field("filled_input", focused: true))
expect(@session.evaluate_script("window.clickedBeforeFocus")).to be_nil
end

it "sends keys to filled contenteditable div" do
Expand Down
1 change: 0 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ module TestSessions

metadata[:skip] = true if metadata[:full_description].match(/#{regexes}/)
metadata[:skip] = "Intentionally skipped" if metadata[:full_description].match(/#{intentional_skip}/)
metadata[:skip] = true if metadata[:requires]&.include?(:active_element)
end

config.around do |example|
Expand Down
Loading