Update GeneratedJsTestServlet to work with test files that use Closure's

jleyba · jleyba · commit 1da3850fa53f · 2015-10-17T21:01:29.000-07:00
module syntax.
diff --git a/java/client/test/org/openqa/selenium/environment/webserver/GeneratedJsTestServlet.java b/java/client/test/org/openqa/selenium/environment/webserver/GeneratedJsTestServlet.java
@@ -45,10 +45,13 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
          + "<script src=\"/third_party/closure/goog/base.js\"></script>\n"
          + "<script src=\"/javascript/deps.js\"></script>\n"
          + "<script>\n"
-         + "  goog.addDependency('../../.." + req.getPathInfo() + "',\n"
-         + "      ['" + symbol + "'],\n"
-         + "      goog.dependencies_.requires['../../.." + req.getPathInfo() + "'] || []);\n"
-         + "  goog.require('" + symbol + "');\n"
+         + "  (function() {\n"
+         + "    var path = '../../.." + req.getPathInfo() + "';\n"
+         + "    goog.addDependency(path, ['" + symbol + "'],\n"
+         + "        goog.dependencies_.requires['../../.." + req.getPathInfo() + "'] || [],\n"
+         + "        !!goog.dependencies_.pathIsModule[path]);\n"
+         + "    goog.require('" + symbol + "');\n"
+         + "  })()\n"
          + "</script></head><body></body></html>").getBytes(Charsets.UTF_8);
 
     resp.setStatus(HttpServletResponse.SC_OK);
