Handle the case where executeScript returns an HTMLDocument.

The W3C spec says that if we return a document element, we should,
instead, return document.documentElement.

Author: shs96c

java/client/src/org/openqa/selenium/htmlunit/HtmlUnitDriver.java

@@ -52,7 +52,9 @@
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlHtml;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.javascript.host.Element;
 import com.gargoylesoftware.htmlunit.javascript.host.Location;
+import com.gargoylesoftware.htmlunit.javascript.host.html.DocumentProxy;
 import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLCollection;
 import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLElement;
 
@@ -760,6 +762,14 @@ private Object parseNativeJavascriptResult(Object result) {
       return newHtmlUnitWebElement(((HTMLElement) value).getDomNodeOrDie());
     }
 
+    if (value instanceof DocumentProxy) {
+      Element element = ((DocumentProxy) value).getDelegee().getDocumentElement();
+      if (element instanceof HTMLElement) {
+        return newHtmlUnitWebElement(((HTMLElement) element).getDomNodeOrDie());
+      }
+      throw new WebDriverException("Do not know how to coerce to an HTMLElement: " + element);
+    }
+
     if (value instanceof Number) {
       final Number n = (Number) value;
       final String s = n.toString();

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

@@ -590,8 +590,19 @@ public void testShouldBeAbleToReturnADateObject() {
     try {
       new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").parse(date);
     } catch (ParseException e) {
-      assertTrue(false);
+      fail();
     }
   }
 
+  @JavascriptEnabled
+  @Test(timeout = 10000)
+  @Ignore(value = {ANDROID, CHROME, IE, IPHONE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI, MARIONETTE})
+  public void shouldReturnDocumentElementIfDocumentIsReturned() {
+    driver.get(pages.simpleTestPage);
+
+    Object value = executeScript("return document");
+
+    assertTrue(value instanceof WebElement);
+    assertTrue(((WebElement) value).getText().contains("A single line of text"));
+  }
 }

javascript/firefox-driver/js/utils.js

@@ -868,6 +868,11 @@ Utils.wrapResult = function(result, doc) {
         return array;
       }
 
+      // Document. Grab the document element.
+      if (result.nodeType == 9) {
+        return Utils.wrapResult(result.documentElement);
+      }
+
       try {
         var nodeList = result.QueryInterface(CI.nsIDOMNodeList);
         var array = [];