fixed problem with error in suites

whatbird · Feb 21, 2012 · 94a4a87 · 94a4a87
1 parent 557861b
commit 94a4a87
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/ci/reporter/minitest.rb b/lib/ci/reporter/minitest.rb
@@ -14,7 +14,9 @@ def self.new(fault, type = nil, meth = nil)
         return MiniTestFailure.new(fault, meth) if type == :failure
         MiniTestError.new(fault)
       end
+    end
 
+    class FailureCore
       def location(e)
         last_before_assertion = ""
         e.backtrace.reverse_each do |s|
@@ -25,7 +27,7 @@ def location(e)
       end
     end
 
-    class MiniTestSkipped < Failure
+    class MiniTestSkipped < FailureCore
       def initialize(fault) @fault = fault end
       def failure?() false end
       def error?() false end
@@ -34,7 +36,7 @@ def message() @fault.message end
       def location() super @fault end
     end
 
-    class MiniTestFailure < Failure
+    class MiniTestFailure < FailureCore
       def initialize(fault, meth) @fault = fault; @meth = meth end
       def failure?() true end
       def error?() false end
@@ -43,7 +45,7 @@ def message() @fault.message end
       def location() super @fault end
     end
 
-    class MiniTestError
+    class MiniTestError < FailureCore
       def initialize(fault) @fault = fault end
       def failure?() false end
       def error?() true end

diff --git a/lib/ci/reporter/test_suite.rb b/lib/ci/reporter/test_suite.rb
@@ -140,7 +140,7 @@ def to_xml(builder)
             failures.each do |failure|
               tag = case failure.class.name
                     when /TestUnitSkipped/ then :skipped
-                    when /TestUnitError/ then :error
+                    when /TestUnitError/, /MiniTestError/ then :error
                     else :failure end
 
               builder.tag!(tag, :type => builder.trunc!(failure.name), :message => builder.trunc!(failure.message)) do