diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-08 12:18:00 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-09-11 12:08:58 +0100 |
| commit | 5ddde30071f639962dd557c453f2ad01f8f0fd00 (patch) | |
| tree | 775803c4ab35af50aa5f5472cd1fb95fe9d5152d /LayoutTests/dom | |
| parent | 3e63d9b33b753ca86d0765d1b3d711114ba9e34f (diff) | |
| download | external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.zip external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.gz external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.bz2 | |
Merge WebKit at r66666 : Initial merge by git.
Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
Diffstat (limited to 'LayoutTests/dom')
| -rw-r--r-- | LayoutTests/dom/html/level2/html/button03.js | 6 | ||||
| -rw-r--r-- | LayoutTests/dom/xhtml/level2/html/button03.js | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/LayoutTests/dom/html/level2/html/button03.js b/LayoutTests/dom/html/level2/html/button03.js index 1a4ac91..5dc6952 100644 --- a/LayoutTests/dom/html/level2/html/button03.js +++ b/LayoutTests/dom/html/level2/html/button03.js @@ -103,7 +103,11 @@ testNode = nodeList.item(0); vfaction = formNode.action; - assertEquals("formLink","...",vfaction); +// WebKit modification: 26-August-2010 + var expectedAction = document.URL.replace(/[^/]*$/, "") + "..."; +// End WebKit modification + + assertEquals("formLink",expectedAction,vfaction); } diff --git a/LayoutTests/dom/xhtml/level2/html/button03.js b/LayoutTests/dom/xhtml/level2/html/button03.js index 1a4ac91..5dc6952 100644 --- a/LayoutTests/dom/xhtml/level2/html/button03.js +++ b/LayoutTests/dom/xhtml/level2/html/button03.js @@ -103,7 +103,11 @@ testNode = nodeList.item(0); vfaction = formNode.action; - assertEquals("formLink","...",vfaction); +// WebKit modification: 26-August-2010 + var expectedAction = document.URL.replace(/[^/]*$/, "") + "..."; +// End WebKit modification + + assertEquals("formLink",expectedAction,vfaction); } |