Merge pull request sj26#59 from qbart/master

Fix #strip_diff_colors output for CircleCI
amount · May 30, 2018 · 0ecd30d · 0ecd30d
2 parents 66653b6 + bf24f50
commit 0ecd30d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/rspec_junit_formatter.rb b/lib/rspec_junit_formatter.rb
@@ -165,8 +165,8 @@ def escape(text)
     text.to_s.encode(Encoding::UTF_8).gsub(ILLEGAL_REGEXP, ILLEGAL_REPLACEMENT).gsub(DISCOURAGED_REGEXP, DISCOURAGED_REPLACEMENTS)
   end
 
-  STRIP_DIFF_COLORS_BLOCK_REGEXP = /^ ( [ ]* ) Diff: (?: \e\[0m )? (?: \n \1 \e\[\d+m .* )* /x
-  STRIP_DIFF_COLORS_CODES_REGEXP = /\e\[\d+m/
+  STRIP_DIFF_COLORS_BLOCK_REGEXP = /^ ( [ ]* ) Diff: (?: \e\[0m )? (?: \n \1 \e\[(\d+;?){1,3}m .* )* /x
+  STRIP_DIFF_COLORS_CODES_REGEXP = /\e\[(\d+;?){1,3}m/
 
   def strip_diff_colors(string)
     # XXX: RSpec diffs are appended to the message lines fairly early and will