Index: LayoutTests/editing/deleting/smart-delete-004.html |
diff --git a/LayoutTests/editing/deleting/smart-delete-004.html b/LayoutTests/editing/deleting/smart-delete-004.html |
index 117e5b8e4f298eb1f963692d4e47086b2339251a..a467156cc882020804516e8c506b840390432c25 100644 |
--- a/LayoutTests/editing/deleting/smart-delete-004.html |
+++ b/LayoutTests/editing/deleting/smart-delete-004.html |
@@ -1,15 +1,26 @@ |
+<!DOCTYPE html> |
+<script src="../../resources/js-test.js"></script> |
+<div id="container"> |
+<p>To run it manually, double click on 'bar' and hit forward delete. You should see 'foo baz'.</p> |
+<div id="sample" contenteditable="true">foo b<span id="target">a</span>r baz</div> |
+</div> |
<script> |
-if (window.testRunner) |
- testRunner.dumpEditingCallbacks(); |
-</script> |
-<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script> |
-<p>This tests deleting a selection created with a word granularity. To run it manually, double click on 'bar' and hit forward delete. You should see 'foo baz'.</p> |
-<div id="div" contenteditable="true">foo b<span id="target">a</span>r baz</div> |
- |
-<script> |
+description('This tests deleting a selection created with a word granularity.'); |
if (window.testRunner) { |
- var target = document.getElementById("target"); |
- doubleClick(target.offsetLeft, target.offsetTop + target.offsetHeight / 2); |
- testRunner.execCommand("DeleteForward"); |
+ // We don't care about select word includes trailing space or not in this |
+ // test. mac/unix selects only words, but win select word and a space. |
+ internals.settings.setSelectTrailingWhitespaceEnabled(true); |
+ var target = document.getElementById('target'); |
+ eventSender.mouseMoveTo(target.offsetLeft, target.offsetTop + target.offsetHeight / 2); |
+ eventSender.mouseDown(); |
+ eventSender.mouseUp(); |
+ eventSender.mouseDown(); |
+ eventSender.mouseUp(); |
+ testRunner.execCommand('DeleteForward'); |
+ shouldBeEqualToString('sample.innerText', 'foo baz'); |
+ shouldBe('getSelection().rangeCount', '1'); |
+ shouldBe('getSelection().focusNode', 'sample.firstChild'); |
+ shouldBe('getSelection().focusOffset', '4'); |
+ document.getElementById('container').outerHTML = ''; |
} |
</script> |