Fix multiline messages missing in output

This affected especially error messages containing backtraces.
rspec · Dec 16, 2017 · ad7ddcc · ad7ddcc
1 parent 38774ba
commit ad7ddcc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Support/lib/rspec/mate/runner.rb b/Support/lib/rspec/mate/runner.rb
@@ -58,6 +58,7 @@ def run_rspec(argv)
         old_stderr = $stderr
         $stderr    = stderr
 
+        Thread.abort_on_exception = true
         Dir.chdir(project_directory) do
           cmd = Executable.find("rspec") + argv
           Open3.popen3(*cmd) do |i, out, err, _thread|

diff --git a/Support/lib/rspec/mate/text_mate_backtrace_printer.rb b/Support/lib/rspec/mate/text_mate_backtrace_printer.rb
@@ -15,13 +15,17 @@ def initialize(output)
           @messages = []
           @messages_before_start = []
         end
+
+        def escape_js_string(str)
+          h(str).gsub(/\r?\n/, '<br>')
+        end
 
         def message(str)
           str = str.strip
           return if @messages.include?(str) # Avoid duplicate messages (e.g. seed notifications in RSpec 3.2)
           @messages << str
           if @html_output_started
-            @output.puts "<script type='text/javascript'>addMessage('#{h str}')</script>"
+            @output.puts "<script type='text/javascript'>addMessage('#{escape_js_string str}')</script>"
           else
             @messages_before_start << str
           end
@@ -31,7 +35,7 @@ def print_html_start
           @output.puts HTML_HEADER
           @output.puts REPORT_HEADER
           @messages_before_start.each do |msg|
-            @output.puts "<script type='text/javascript'>addMessage('#{h msg}')</script>"
+            @output.puts "<script type='text/javascript'>addMessage('#{escape_js_string msg}')</script>"
           end
           @html_output_started = true
         end