Firefox: fixing sendKeys for contentEditable elements, it should append to the existing text.

Author: barancev

java/client/test/org/openqa/selenium/TypingTest.java

@@ -26,6 +26,7 @@
 import static org.junit.Assume.assumeFalse;
 import static org.openqa.selenium.WaitingConditions.elementValueToEqual;
 import static org.openqa.selenium.testing.Ignore.Driver.ALL;
+import static org.openqa.selenium.testing.Ignore.Driver.CHROME;
 import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
 import static org.openqa.selenium.testing.Ignore.Driver.IE;
 import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
@@ -720,7 +721,7 @@ public void testShouldBeAbleToTypeIntoEmptyContentEditableElement() {
     assertThat(editable.getText(), equalTo("cheese"));
   }
 
-  @Ignore(value = {ALL}, reason = "Untested except in Firefox", issues = {2825})
+  @Ignore(value = {CHROME, IE, SAFARI, HTMLUNIT, MARIONETTE})
   @Test
   public void testShouldBeAbleToTypeIntoContentEditableElementWithExistingValue() {
     driver.get(pages.readOnlyPage);

javascript/firefox-driver/js/wrappedElement.js

@@ -145,11 +145,34 @@ WebElement.sendKeysToElement = function(respond, parameters) {
 
   // We may need a beat for firefox to hand over focus.
   this.jsTimer.setTimeout(function() {
-    // Unless the element already had focus, set the cursor location to the end of the line
-    // TODO(simon): This seems a little arbitrary.
     if (!alreadyFocused && bot.dom.isEditable(element)) {
-        var length = element.value ? element.value.length : goog.dom.getTextContent(element).length;
+      var length = element.value ? element.value.length : goog.dom.getTextContent(element).length;
+
+      if (bot.dom.isContentEditable(element)) {
+        var doc = element.ownerDocument || element.document;
+        var rng = doc.createRange();
+        var walker = doc.createTreeWalker(element, 4/*NodeFilter.SHOW_TEXT*/, null, null);
+        var start = length;
+        var end = length;
+        var n,pos = 0;
+        while (n = walker.nextNode()) {
+          pos += n.nodeValue.length;
+          if (pos >= start) {
+            rng.setStart(n, n.nodeValue.length + start - pos);
+            start = Infinity;
+          }
+          if (pos >= end) {
+            rng.setEnd(n, n.nodeValue.length + end - pos);
+            break;
+          }
+        }
+        var sel = doc.getSelection();
+        sel.removeAllRanges();
+        sel.addRange(rng);
+
+      } else {
         goog.dom.selection.setCursorPosition(element, length);
+      }
     }
 
     try {