diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /LayoutTests/fast/url/script-tests | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'LayoutTests/fast/url/script-tests')
| -rw-r--r-- | LayoutTests/fast/url/script-tests/anchor.js | 1 | ||||
| -rw-r--r-- | LayoutTests/fast/url/script-tests/path.js | 3 | ||||
| -rw-r--r-- | LayoutTests/fast/url/script-tests/port.js | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/LayoutTests/fast/url/script-tests/anchor.js b/LayoutTests/fast/url/script-tests/anchor.js index 0387a86..8791b74 100644 --- a/LayoutTests/fast/url/script-tests/anchor.js +++ b/LayoutTests/fast/url/script-tests/anchor.js @@ -9,6 +9,7 @@ cases = [ ["a\\uFDD0", "a\\uFDD0"], ["asdf#qwer", "asdf#qwer"], ["#asdf", "#asdf"], + ["a\\nb\\rc\\td", "abcd"], ]; for (var i = 0; i < cases.length; ++i) { diff --git a/LayoutTests/fast/url/script-tests/path.js b/LayoutTests/fast/url/script-tests/path.js index 10aaf4d..fb082ad 100644 --- a/LayoutTests/fast/url/script-tests/path.js +++ b/LayoutTests/fast/url/script-tests/path.js @@ -23,6 +23,9 @@ cases = [ // Multiple slashes in a row should be preserved and treated like empty // directory names. ["////../..", "//"], + ["/foo/bar//../..", "/foo/"], + ["/foo/bar//..", "/foo/bar/"], + ["/foo/bar/..", "/foo/"], // ----- escaping tests ----- ["/foo", "/foo"], diff --git a/LayoutTests/fast/url/script-tests/port.js b/LayoutTests/fast/url/script-tests/port.js index b3228b1..e9e6057 100644 --- a/LayoutTests/fast/url/script-tests/port.js +++ b/LayoutTests/fast/url/script-tests/port.js @@ -7,6 +7,8 @@ cases = [ // Default port should be omitted. ["80", ""], ["8080", ":8080"], + // Empty ports (just a colon) should also be removed + ["", ""], ]; for (var i = 0; i < cases.length; ++i) { |