Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix test_clipboard_paste to pass on Mac OS.

Browse source
This commit is contained in:
Avi Weinstock 2015-05-06 15:30:29 -04:00
parent 0587717944
commit d054946f7d
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tests/unit/script/textinput.rs
View file

@ -7,7 +7,13 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
use msg::constellation_msg::{Key, CONTROL}; use msg::constellation_msg::{Key, KeyModifiers};
#[cfg(target_os="macos")]
use msg::constellation_msg::SUPER;
#[cfg(not(target_os="macos"))]
use msg::constellation_msg::CONTROL;
use script::textinput::{TextInput, Selection, Lines, DeleteDir}; use script::textinput::{TextInput, Selection, Lines, DeleteDir};
use script::clipboard_provider::DummyClipboardContext; use script::clipboard_provider::DummyClipboardContext;
use std::borrow::ToOwned; use std::borrow::ToOwned;
@ -169,9 +175,14 @@ fn test_textinput_set_content() {
#[test] #[test]
fn test_clipboard_paste() { fn test_clipboard_paste() {
#[cfg(target_os="macos")]
const MODIFIERS: KeyModifiers = SUPER;
#[cfg(not(target_os="macos"))]
const MODIFIERS: KeyModifiers = CONTROL;
let mut textinput = TextInput::new(Lines::Single, "defg".to_owned(), DummyClipboardContext::new("abc")); let mut textinput = TextInput::new(Lines::Single, "defg".to_owned(), DummyClipboardContext::new("abc"));
assert_eq!(textinput.get_content(), "defg"); assert_eq!(textinput.get_content(), "defg");
assert_eq!(textinput.edit_point.index, 0); assert_eq!(textinput.edit_point.index, 0);
textinput.handle_keydown_aux(Key::V, CONTROL); textinput.handle_keydown_aux(Key::V, MODIFIERS);
assert_eq!(textinput.get_content(), "abcdefg"); assert_eq!(textinput.get_content(), "abcdefg");
} }