diff options
| author | Sam Gibson <sam@ifdown.net> | 2015-12-01 20:40:37 +1100 |
|---|---|---|
| committer | Sam Gibson <sam@ifdown.net> | 2015-12-03 14:00:53 +1100 |
| commit | 2ba1750c403e59556f667b163d5d2a90dd5f6dd6 (patch) | |
| tree | 0f766072a20256a909e31183b2a6870a7a31a291 /tests/unit/script/textinput.rs | |
| parent | 419a26e6192a31478302c310910f1ae8f6f5e3ae (diff) | |
| download | servo-2ba1750c403e59556f667b163d5d2a90dd5f6dd6.tar.gz servo-2ba1750c403e59556f667b163d5d2a90dd5f6dd6.zip | |
Resolves long-running merge conflicts
Diffstat (limited to 'tests/unit/script/textinput.rs')
| -rw-r--r-- | tests/unit/script/textinput.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/unit/script/textinput.rs b/tests/unit/script/textinput.rs index 75a49c824dc..c5071f36090 100644 --- a/tests/unit/script/textinput.rs +++ b/tests/unit/script/textinput.rs @@ -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] |