ci_reporter 1.3.2 → 1.3.3

data/History.txt

@@ -1,3 +1,8 @@
+== 1.3.3
+
+- Use SPEC_OPTS instead of RSPECOPTS (Aslak Hellesøy)
+- Add assertions attribute to individual test cases (Tracker #11563, Andy Sipe)
+
 == 1.3.2
 
 - Fix bug trying to modify frozen environment strings

data/README.txt

@@ -2,9 +2,7 @@ CI::Reporter is an add-on to Test::Unit and RSpec that allows you to generate XM
 
 == Dependencies
 
-CI::Reporter has one required dependency on Builder, but since many will have a viable version of Builder via Rails' ActiveSupport gem, Builder is not a direct dependency of the project at the moment.  Instead, ensure that you have either the +builder+ or +activesupport+ gem installed before continuing.
-
-*NOTE*: As of this release, CI::Reporter is only compatible with RSpec up through version 0.8.2.  The 0.9 series has introduced an incompatibility that has not been rectified yet.
+CI::Reporter has one required dependency on Builder, but since many will have a viable version of Builder via Rails' ActiveSupport gem, Builder is not a direct dependency of the project at the moment.  Instead, ensure that you have either the +builder+ or +activesupport+ gem installed before continuing.  CI::Reporter will raise an exception at runtime if it cannot locate Builder.
 
 == Installation
 
@@ -18,7 +16,7 @@ To use CI::Reporter as a Rails plugin, first install the gem, and then install t
 
 == Usage
 
-CI::Reporter works best with projects that use a +Rakefile+ along with the standard <code>Rake::TestTask</code> or <code>Spec::Rake::SpecTask</code> tasks for running tests or specs, respectively. In this fashion, it hooks into <code>Test::Unit</code> or +RSpec+ using environment variables recognized by these custom tasks to inject the CI::Reporter code into the test or spec runs.  If you're using the Rails plugin, step 1 is unnecessary; skip to step 2.
+CI::Reporter works best with projects that use a +Rakefile+ along with the standard <code>Rake::TestTask</code> or <code>Spec::Rake::SpecTask</code> tasks for running tests or examples, respectively. In this fashion, it hooks into <code>Test::Unit</code> or +RSpec+ using environment variables recognized by these custom tasks to inject the CI::Reporter code into the test or spec runs.  If you're using the Rails plugin, step 1 is unnecessary; skip to step 2.
 
 1. To use CI::Reporter, simply add the following lines to your Rakefile:
 
@@ -49,6 +47,12 @@ There's a bit of a chicken and egg problem because rubygems needs to be loaded b
 * +CI_REPORTS+: if set, points to a directory where report files will be written.
 * +CI_CAPTURE+: if set to value "off", stdout/stderr capture will be disabled.
 
+== Source
+
+CI::Reporter source is not currently located in Rubyforge's SVN.  To get the source:
+
+    svn co http://svn.caldersphere.net/svn/main/rubyforge/ci_reporter/trunk ci_reporter
+
 == License
 
 This software is released under an MIT license.  For details, see the LICENSE.txt file included with the distribution.  The software is copyright (c) 2006-2007 Nick Sieger <nicksieger@gmail.com>.

data/Rakefile

@@ -5,7 +5,7 @@ MANIFEST = FileList["History.txt", "Manifest.txt", "README.txt", "LICENSE.txt",
 
 begin
   require 'hoe'
-  hoe = Hoe.new("ci_reporter", "1.3.2") do |p|
+  hoe = Hoe.new("ci_reporter", "1.3.3") do |p|
     p.rubyforge_name = "caldersphere"
     p.url = "http://caldersphere.rubyforge.org/ci_reporter"
     p.author = "Nick Sieger"

data/lib/ci/reporter/rake/rspec.rb

@@ -6,9 +6,14 @@ namespace :ci do
   namespace :setup do
     task :rspec do
       rm_rf ENV["CI_REPORTS"] || "spec/reports"
+
+      spec_opts = ["--require", "#{File.dirname(__FILE__)}/rspec_loader.rb", 
+        "--format", "CI::Reporter::RSpec"].join(" ")      
+      ENV["SPEC_OPTS"] ||= ""
+      ENV["SPEC_OPTS"] += spec_opts
+      # Pre RSpec 1.0.6
       ENV["RSPECOPTS"] ||= ""
-      ENV["RSPECOPTS"] += [" --require", "#{File.dirname(__FILE__)}/rspec_loader.rb", 
-        "--format", "CI::Reporter::RSpec"].join(" ")
+      ENV["RSPECOPTS"] += spec_opts
     end
   end
 end

data/lib/ci/reporter/test_suite.rb

@@ -111,7 +111,7 @@ module CI
     end
 
     # Structure used to represent an individual test case.  Used to time the test and store the result.
-    class TestCase < Struct.new(:name, :time)
+    class TestCase < Struct.new(:name, :time, :assertions)
       attr_accessor :failure
 
       # Starts timing the test.
@@ -137,7 +137,7 @@ module CI
       # Writes xml representing the test result to the provided builder.
       def to_xml(builder)
         attrs = {}
-        each_pair {|k,v| attrs[k] = builder.trunc!(v.to_s) }
+        each_pair {|k,v| attrs[k] = builder.trunc!(v.to_s) unless v.nil? || v.to_s.empty?}
         builder.testcase(attrs) do
           if failure
             builder.failure(:type => builder.trunc!(failure.name), :message => builder.trunc!(failure.message)) do

data/lib/ci/reporter/test_unit.rb

@@ -57,6 +57,7 @@ module CI
         @last_assertion_count = 0
         @current_suite = nil
         @unknown_count = 0
+        @result_assertion_count = 0
       end
 
       def test_started(name)
@@ -115,6 +116,8 @@ module CI
         tc = @current_suite.testcases.last
         tc.finish
         tc.failure = Failure.new(failure) if failure
+        tc.assertions = @suite_result.assertion_count - @result_assertion_count
+        @result_assertion_count = @suite_result.assertion_count
       end
     end
   end

data/spec/ci/reporter/rake/rake_tasks_spec.rb

@@ -46,23 +46,23 @@ describe "ci_reporter ci:setup:rspec task" do
     Rake.application = @rake
     load CI_REPORTER_LIB + '/ci/reporter/rake/rspec.rb'
     save_env "CI_REPORTS"
-    save_env "RSPECOPTS"
+    save_env "SPEC_OPTS"
     ENV["CI_REPORTS"] = "some-bogus-nonexistent-directory-that-wont-fail-rm_rf"
   end
   after(:each) do
-    restore_env "RSPECOPTS"
+    restore_env "SPEC_OPTS"
     restore_env "CI_REPORTS"
     Rake.application = nil
   end
   
-  it "should set ENV['RSPECOPTS'] to include rspec formatter args" do
+  it "should set ENV['SPEC_OPTS'] to include rspec formatter args" do
     @rake["ci:setup:rspec"].invoke
-    ENV["RSPECOPTS"].should =~ /--require.*rspec_loader.*--format.*CI::Reporter::RSpec/
+    ENV["SPEC_OPTS"].should =~ /--require.*rspec_loader.*--format.*CI::Reporter::RSpec/
   end
   
-  it "should append to ENV['RSPECOPTS'] if it already contains a value" do
-    ENV["RSPECOPTS"] = "somevalue".freeze
+  it "should append to ENV['SPEC_OPTS'] if it already contains a value" do
+    ENV["SPEC_OPTS"] = "somevalue".freeze
     @rake["ci:setup:rspec"].invoke
-    ENV["RSPECOPTS"].should =~ /somevalue.*--require.*rspec_loader.*--format.*CI::Reporter::RSpec/
+    ENV["SPEC_OPTS"].should =~ /somevalue.*--require.*rspec_loader.*--format.*CI::Reporter::RSpec/
   end
 end

data/spec/ci/reporter/test_unit_spec.rb

@@ -47,9 +47,12 @@ describe "The TestUnit reporter" do
     @suites.first.name.should == "TestCaseClass"
     @suites.first.testcases.length.should == 1
     @suites.first.testcases.first.name.should == "test_one"
+    @suites.first.testcases.first.assertions.should == 7
+
     @suites.last.name.should == "AnotherTestCaseClass"
     @suites.last.testcases.length.should == 1
     @suites.last.testcases.first.name.should == "test_two"
+    @suites.last.testcases.first.assertions.should == 0
   end
   
   it "should record assertion counts during test run" do
@@ -62,6 +65,7 @@ describe "The TestUnit reporter" do
     @testunit.finished(10)
 
     @suite.assertions.should == 7
+    @suite.testcases.last.assertions.should == 7
   end
   
   it "should add failures to testcases when encountering a fault" do

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ci_reporter
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
-date: 2007-06-06 00:00:00 -07:00
+  version: 1.3.3
+date: 2007-06-18 00:00:00 -05:00
 summary: CI::Reporter allows you to generate reams of XML for use with continuous integration systems.
 require_paths: 
 - lib