Fix some broken tests

jleyba · jleyba · commit 3a3cc8adbfae · 2015-06-19T10:12:51.000-07:00
- webdriver.testing.Client still needs to use goog.json.serialize.
- Fix generated test pages to force IE8+ into standards mode.
diff --git a/java/client/test/org/openqa/selenium/environment/webserver/GeneratedJsTestServlet.java b/java/client/test/org/openqa/selenium/environment/webserver/GeneratedJsTestServlet.java
@@ -36,8 +36,11 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
       throws ServletException, IOException {
     String symbol = Strings.nullToEmpty(req.getPathInfo()).replace("../", "").replace("/", "$");
     byte[] data =
-        ("<!-- File generated by " + getClass().getName() + " -->\n"
-         + "<!DOCTYPE html>\n"
+        ("<!DOCTYPE html>\n"
+         + "<html>\n"
+         + "<head>\n"
+         + "<meta http-equiv=\"X-UA-Compatible\" content=\"IE-Edge\">\n"
+         + "<!-- File generated by " + getClass().getName() + " -->\n"
          + "<title>" + req.getPathInfo() + "</title>\n"
          + "<script src=\"/third_party/closure/goog/base.js\"></script>\n"
          + "<script src=\"/javascript/deps.js\"></script>\n"
@@ -46,7 +49,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
          + "      ['" + symbol + "'],\n"
          + "      goog.dependencies_.requires['../../.." + req.getPathInfo() + "'] || []);\n"
          + "  goog.require('" + symbol + "');\n"
-         + "</script>").getBytes(Charsets.UTF_8);
+         + "</script></head><body></body></html>").getBytes(Charsets.UTF_8);
 
     resp.setStatus(HttpServletResponse.SC_OK);
     resp.setContentType(MediaType.HTML_UTF_8.toString());
diff --git a/javascript/webdriver/testing/client.js b/javascript/webdriver/testing/client.js
@@ -17,6 +17,7 @@
 
 goog.provide('webdriver.testing.Client');
 
+goog.require('goog.json');
 goog.require('goog.net.XmlHttp');
 
 
@@ -165,7 +166,7 @@ webdriver.testing.Client.prototype.sendScreenshotEvent = function(data,
 * @private
 */
 webdriver.testing.Client.prototype.sendEvent_ = function(type, opt_data) {
-  var payload = JSON.stringify({
+  var payload = goog.json.serialize({
     'id': this.id_,
     'type': type,
     'data': opt_data || {}
