Skip to content

webdriver: Do not unwrap when clear undo_actions #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
madsmtm merged 2 commits into from
Dec 16, 2025
Merged

webdriver: Do not unwrap when clear undo_actions #95

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
181626f
webdriver: Do not unwrap when clear `undo_actions`
yezhizhen Dec 2, 2025
d01553e
Add unit test
yezhizhen Dec 16, 2025
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
32 changes: 31 additions & 1 deletion src/webdriver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,11 @@ impl KeyInputState {
let mut actions: Vec<_> = undo_actions.drain().collect();
actions.sort_unstable();
for action in actions {
result.push(self.dispatch_keyup(action).unwrap().into());
// When we `dispatch_typeable`, we may have already dispatched keyup

@yezhizhen yezhizhen Dec 15, 2025

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.

This happens at

keyboard-types/src/webdriver.rs

Line 398 in 24446d6

result.push(self.dispatch_keyup('\u{E008}').unwrap().into());
.

// but did not update `undo_actions`.
if let Some(event) = self.dispatch_keyup(action) {
result.push(event.into());
}
}
assert!(undo_actions.is_empty());
}
Expand Down Expand Up @@ -510,3 +514,29 @@ pub fn send_keys(text: &str) -> Vec<Event> {
state.clear(&mut undo_actions, &mut result);
result
}

#[cfg(test)]
mod test {
use super::*;
use std::vec;

#[test]
fn test_send_key_with_shift() {
let result: Vec<(KeyState, Key)> = send_keys("\u{e008}y")
.iter()
.map(|e| match e {
Event::Keyboard(key_event) => (key_event.state, key_event.key.clone()),
_ => unreachable!("Unexpected event"),
})
.collect();

let expected = vec![
(KeyState::Down, Key::Named(NamedKey::Shift)),
(KeyState::Up, Key::Named(NamedKey::Shift)),
(KeyState::Down, Key::Character("y".to_string())),
(KeyState::Up, Key::Character("y".to_string())),
];

assert_eq!(result, expected);
}
}
Loading