Correctly process driver stacktrace upon error

Related to #3683
SeleniumHQ · Aug 16, 2017 · f4bd516 · f4bd516
1 parent 3c69c54
commit f4bd516
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/rb/lib/selenium/webdriver/remote/response.rb b/rb/lib/selenium/webdriver/remote/response.rb
@@ -22,6 +22,8 @@ module WebDriver
     module Remote
       # @api private
       class Response
+        STACKTRACE_KEY = 'stackTrace'.freeze
+
         attr_reader :code, :payload
         attr_writer :payload
 
@@ -73,11 +75,23 @@ def assert_ok
         end
 
         def add_backtrace(ex)
-          return unless value.is_a?(Hash) && value['stackTrace']
+          return unless error_payload.is_a?(Hash)
+
+          server_trace = error_payload[STACKTRACE_KEY] || error_payload[STACKTRACE_KEY.downcase]
+          return unless server_trace
 
-          server_trace = value['stackTrace']
+          backtrace = case server_trace
+                      when Array
+                        backtrace_from_remote(server_trace)
+                      when String
+                        server_trace.split("\n")
+                      end
 
-          backtrace = server_trace.map do |frame|
+          ex.set_backtrace(backtrace + ex.backtrace)
+        end
+
+        def backtrace_from_remote(server_trace)
+          server_trace.map do |frame|
             next unless frame.is_a?(Hash)
 
             file = frame['fileName']
@@ -91,8 +105,6 @@ def add_backtrace(ex)
 
             "[remote server] #{file}:#{line}:in `#{meth}'"
           end.compact
-
-          ex.set_backtrace(backtrace + ex.backtrace)
         end
 
         def error_payload