Use REXML::Element#texts instead

Author: toolmantim

ruby/bin/annotate

@@ -3,35 +3,6 @@
 require 'rexml/document'
 require 'rexml/element'
 
-# Adapted from https://stackoverflow.com/a/25888239/759019
-class REXML::Element
-  def innerHTML=(xml)
-    require "rexml/document"
-    self.to_a.each do |e|
-      self.delete e
-    end
-    d = REXML::Document.new "<root>#{xml}</root>"
-    d.root.to_a.each do |e|
-      case e
-      when REXML::Text
-        self.add_text e
-      when REXML::Element
-        self.add_element e
-      else
-        puts "ERROR"
-      end
-    end
-    xml
-  end
-  def inner_html
-    ret = ''
-    self.to_a.each do |e|
-      ret += e.to_s
-    end
-    ret
-  end
-end
-
 # Reads a list of junit files and returns a nice Buildkite build annotation on
 # STDOUT that summarizes any failures.
 
@@ -51,6 +22,16 @@ end
 junit_report_files = Dir.glob(File.join(junits_dir, "**", "*"))
 failures = []
 
+def text_content(element)
+  # Handle mulptiple CDATA/text children elements
+  text = element.texts().map(&:value).join.strip
+  if text.empty?
+    nil
+  else
+    text
+  end
+end
+
 junit_report_files.sort.each do |file|
   next if File.directory?(file)
 
@@ -63,10 +44,10 @@ junit_report_files.sort.each do |file|
     name = testcase.attributes['name'].to_s
     failed_test = testcase.attributes[failure_format].to_s
     testcase.elements.each("failure") do |failure|
-      failures << Failure.new(name, failed_test, failure.inner_html, job, :failure)
+      failures << Failure.new(name, failed_test, text_content(failure), job, :failure)
     end
     testcase.elements.each("error") do |error|
-      failures << Failure.new(name, failed_test, error.inner_html, job, :error)
+      failures << Failure.new(name, failed_test, text_content(error), job, :error)
     end
   end
 end