Resolves long-running merge conflicts

This commit is contained in:
Sam Gibson 2015-12-01 20:40:37 +11:00
parent 419a26e619
commit 2ba1750c40
3 changed files with 11 additions and 14 deletions

View file

@ -23,11 +23,11 @@ fn text_input(lines: Lines, s: &str) -> TextInput<DummyClipboardContext> {
#[test]
fn test_set_content_ignores_max_length() {
let mut textinput = TextInput::new(
Lines::Single, "".to_owned(), DummyClipboardContext::new(""), Some(1)
Lines::Single, DOMString::from(""), DummyClipboardContext::new(""), Some(1)
);
textinput.set_content("mozilla rocks".to_owned());
assert_eq!(textinput.get_content(), "mozilla rocks".to_owned());
textinput.set_content(DOMString::from("mozilla rocks"));
assert_eq!(textinput.get_content(), DOMString::from("mozilla rocks"));
}
#[test]