Skip to content
Open
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 @@ -4,6 +4,8 @@

### Changed

- Change `Node#send_keys` to avoid triggering `click` on an already focused element [#327]

### Fixed

### Removed
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 @@ -523,6 +523,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 @@ -66,7 +66,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)))

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@route are you able to provide review for this change?

I'm happy to explore something more ad hoc if introducing a "public" hasFocus JavaScript method is undesirable.

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 @@ -1331,13 +1331,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
Loading