Correcting invalid session ID response JSON payload for IE driver

SeleniumHQ · Jul 10, 2018 · 94678f7 · 94678f7
1 parent 67b6c8d
commit 94678f7
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/cpp/webdriver-server/server.cc b/cpp/webdriver-server/server.cc
@@ -19,6 +19,7 @@
 #include <cstring>
 #include <sstream>
 #include "session.h"
+#include "errorcodes.h"
 #include "uri_info.h"
 #include "logging.h"
 
@@ -340,7 +341,8 @@ std::string Server::DispatchCommand(const std::string& uri,
 
   if (command == webdriver::CommandType::NoCommand) {
     // Hand-code the response for an unknown URL
-    serialized_response.append("{ \"error\" : \"unknown method\", ");
+    serialized_response.append("{ \"value\" : { ");
+    serialized_response.append("\"error\" : \"unknown method\", ");
     serialized_response.append("\"message\" : \"Command not found: ");
     serialized_response.append(http_verb);
     serialized_response.append(" ");
@@ -364,18 +366,23 @@ std::string Server::DispatchCommand(const std::string& uri,
         serialized_response.append("{ \"value\" : null }");
       } else {
         // Hand-code the response for an invalid session id
-        serialized_response.append("{ \"error\" : \"invalid session id\", ");
+        serialized_response.append("{ \"value\" : { ");
+        serialized_response.append("\"error\" : \"");
+        serialized_response.append(ERROR_INVALID_SESSION_ID).append("\", ");
         serialized_response.append("\"message\" : \"session ");
         serialized_response.append(session_id);
-        serialized_response.append(" does not exist\" }");
+        serialized_response.append(" does not exist\", ");
+        serialized_response.append("\"stacktrace\" : \"\" }");
+        serialized_response.append("}");
       }
     } else {
       if (command == webdriver::CommandType::NewSession &&
           this->sessions_.size() > 0) {
         // According to the W3C Specification, only a single session is
         // allowed by a single driver instance.
         serialized_response.append("{ \"value\" : { ");
-        serialized_response.append("\"error\" : \"session not created\", ");
+        serialized_response.append("\"error\" : \"");
+        serialized_response.append(ERROR_SESSION_NOT_CREATED).append("\", ");
         serialized_response.append("\"message\" : \"only one session may ");
         serialized_response.append("be created at a time, and a session ");
         serialized_response.append("already exists\", ");