ci_reporter 1.6.1 → 1.6.2

data/History.txt

@@ -1,3 +1,9 @@
+== 1.6.2
+
+- GH #1: Properly escape text in system-out and system-err tags (Matt Kanwisher)
+- GH #2: Report rspec before(:all) failures (Edgars Beigarts)
+- GH #3: Support for Omissions and Pending Tests from Test::Unit 2.0.x (Sam Hendley)
+
 == 1.6.1
 
 - Add 'skipped' flag for pending RSpec examples (Aaron Unger)

data/lib/ci/reporter/rspec.rb

@@ -81,6 +81,10 @@ module CI
 
       def example_failed(name, counter, failure)
         @formatter.example_failed(name, counter, failure)
+        # In case we fail in before(:all)
+        if @suite.testcases.empty?
+          example_started(name)
+        end
         spec = @suite.testcases.last
         spec.finish
         spec.failures << RSpecFailure.new(failure)

data/lib/ci/reporter/test_suite.rb

@@ -92,10 +92,10 @@ module CI
             tc.to_xml(builder)
           end
           builder.tag! "system-out" do
-            builder.cdata! self.stdout
+            builder.text! self.stdout
           end
           builder.tag! "system-err" do
-            builder.cdata! self.stderr
+            builder.text! self.stderr
           end
         end
       end

data/lib/ci/reporter/test_unit.rb

@@ -12,15 +12,15 @@ module CI
     # of the test.
     class Failure
       def self.new(fault)
-        fault.kind_of?(Test::Unit::Failure) ? TestUnitFailure.new(fault) : TestUnitError.new(fault)
+        return TestUnitFailure.new(fault) if fault.kind_of?(Test::Unit::Failure)
+        return TestUnitSkipped.new(fault) if Test::Unit.constants.include?("Omission") && (fault.kind_of?(Test::Unit::Omission) || fault.kind_of?(Test::Unit::Pending))
+        TestUnitError.new(fault)
       end
     end
 
     # Wrapper around a <code>Test::Unit</code> error to be used by the test suite to interpret results.
     class TestUnitError
-      def initialize(fault)
-        @fault = fault
-      end
+      def initialize(fault) @fault = fault end
       def failure?() false end
       def error?() true end
       def name() @fault.exception.class.name end
@@ -30,9 +30,7 @@ module CI
 
     # Wrapper around a <code>Test::Unit</code> failure to be used by the test suite to interpret results.
     class TestUnitFailure
-      def initialize(fault)
-        @fault = fault
-      end
+      def initialize(fault) @fault = fault end
       def failure?() true end
       def error?() false end
       def name() Test::Unit::AssertionFailedError.name end
@@ -40,6 +38,16 @@ module CI
       def location() @fault.location.join("\n") end
     end
 
+    # Wrapper around a <code>Test::Unit</code> 2.0 omission.
+    class TestUnitSkipped
+      def initialize(fault) @fault = fault end
+      def failure?() false end
+      def error?() false end
+      def name() Test::Unit::Omission.name end
+      def message() @fault.message end
+      def location() @fault.location.join("\n") end
+    end
+
     # Replacement Mediator that adds listeners to capture the results of the <code>Test::Unit</code> runs.
     class TestUnit < Test::Unit::UI::TestRunnerMediator
       def initialize(suite, report_mgr = nil)
@@ -100,7 +108,7 @@ module CI
 
       def finish_suite
         if @current_suite
-          @current_suite.finish 
+          @current_suite.finish
           @current_suite.assertions = @suite_result.assertion_count - @last_assertion_count
           @last_assertion_count = @suite_result.assertion_count
           @report_manager.write_report(@current_suite)

data/lib/ci/reporter/version.rb

@@ -1,5 +1,5 @@
 module CI
   module Reporter
-    VERSION = "1.6.1"
+    VERSION = "1.6.2"
   end
 end

data/spec/ci/reporter/output_capture_spec.rb

@@ -28,8 +28,8 @@ describe "Output capture" do
     root = REXML::Document.new(@suite.to_xml).root
     root.elements.to_a('//system-out').length.should == 1
     root.elements.to_a('//system-err').length.should == 1
-    root.elements.to_a('//system-out').first.cdatas.first.to_s.should == "Hello\n"
-    root.elements.to_a('//system-err').first.cdatas.first.to_s.should == "Hi"
+    root.elements.to_a('//system-out').first.texts.first.to_s.strip.should == "Hello"
+    root.elements.to_a('//system-err').first.texts.first.to_s.strip.should == "Hi"
   end
 
   it "should return $stdout and $stderr to original value after finish" do

data/spec/ci/reporter/rspec_spec.rb

@@ -105,4 +105,21 @@ describe "The RSpec reporter" do
     @fmt.example_passed(example)
     @fmt.dump_summary(0.1, 1, 0, 0)
   end
+
+  it "should create a test suite with failure in before(:all)" do
+    example_group = mock "example group"
+    example_group.stub!(:description).and_return "A context"
+
+    @formatter.should_receive(:start)
+    @formatter.should_receive(:example_group_started).with(example_group)
+    @formatter.should_receive(:example_started).once
+    @formatter.should_receive(:example_failed).once
+    @formatter.should_receive(:dump_summary)
+    @report_mgr.should_receive(:write_report)
+
+    @fmt.start(2)
+    @fmt.example_group_started(example_group)
+    @fmt.example_failed("should fail", 1, @error)
+    @fmt.dump_summary(0.1, 1, 0, 0)
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 1
-  version: 1.6.1
+  - 2
+  version: 1.6.2
 platform: ruby
 authors: 
 - Nick Sieger
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-25 00:00:00 -05:00
+date: 2010-03-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency