ci_reporter 1.6.2 → 1.6.3

data/History.txt

@@ -1,3 +1,11 @@
+== 1.6.3
+
+- Thanks to yairgo and tylerkovacs for their assistance and prodding
+  for RSpec 2 support this release.
+- GH #4: Updated for modern Cucumber (0.9.2 as of this writing)
+- GH #6: Capture dynamically-named RSpec examples
+- GH #7: RSpec 2.0.0 compatibility
+
 == 1.6.2
 
 - GH #1: Properly escape text in system-out and system-err tags (Matt Kanwisher)

data/Manifest.txt

@@ -6,23 +6,24 @@ Rakefile
 stub.rake
 lib/ci/reporter/core.rb
 lib/ci/reporter/cucumber.rb
+lib/ci/reporter/report_manager.rb
+lib/ci/reporter/rspec.rb
+lib/ci/reporter/test_suite.rb
+lib/ci/reporter/test_unit.rb
+lib/ci/reporter/version.rb
 lib/ci/reporter/rake/cucumber.rb
 lib/ci/reporter/rake/cucumber_loader.rb
 lib/ci/reporter/rake/rspec.rb
 lib/ci/reporter/rake/rspec_loader.rb
 lib/ci/reporter/rake/test_unit.rb
 lib/ci/reporter/rake/test_unit_loader.rb
-lib/ci/reporter/report_manager.rb
-lib/ci/reporter/rspec.rb
-lib/ci/reporter/test_suite.rb
-lib/ci/reporter/test_unit.rb
-lib/ci/reporter/version.rb
+lib/ci/reporter/rake/utils.rb
+spec/spec_helper.rb
 spec/ci/reporter/cucumber_spec.rb
 spec/ci/reporter/output_capture_spec.rb
-spec/ci/reporter/rake/rake_tasks_spec.rb
 spec/ci/reporter/report_manager_spec.rb
 spec/ci/reporter/rspec_spec.rb
 spec/ci/reporter/test_suite_spec.rb
 spec/ci/reporter/test_unit_spec.rb
-spec/spec_helper.rb
+spec/ci/reporter/rake/rake_tasks_spec.rb
 tasks/ci_reporter.rake

data/README.txt

@@ -1,9 +1,5 @@
 CI::Reporter is an add-on to Test::Unit, RSpec and Cucumber that allows you to generate XML reports of your test, spec and/or feature runs. The resulting files can be read by a continuous integration system that understands Ant's JUnit report XML format, thus allowing your CI system to track test/spec successes and failures.
 
-== 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.  CI::Reporter will raise an exception at runtime if it cannot locate Builder.
-
 == Installation
 
 CI::Reporter is available as a gem. To install the gem, use the usual gem command:
@@ -12,12 +8,11 @@ CI::Reporter is available as a gem. To install the gem, use the usual gem comman
 
 == 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 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.
+CI::Reporter works best with projects that use a +Rakefile+ along with the standard <code>Rake::TestTask</code> or <code>Spec::Rake::SpecTask/RSpec::Core::RakeTask</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:
 
     require 'rubygems'
-    gem 'ci_reporter'
     require 'ci/reporter/rake/rspec'     # use this if you're using RSpec
     require 'ci/reporter/rake/cucumber'  # use this if you're using Cucumber
     require 'ci/reporter/rake/test_unit' # use this if you're using Test::Unit
@@ -49,7 +44,7 @@ If for some reason you can't use the above technique to inject CI::Reporter (e.g
 
     ruby -r GEM_PATH/lib/ci/reporter/rake/cucumber_loader -S cucumber --format CI::Reporter::Cucumber
 
-There's a bit of a chicken and egg problem because rubygems needs to be loaded before you can require any CI::Reporter files.  If you cringe hard-coding a full path to a specific version of the gem, you can also copy the +rspec_loader+ file into your project and require it directly -- the contents are version-agnostic and are not likely to change in future releases.
+There's a bit of a chicken and egg problem because rubygems needs to be loaded before you can require any CI::Reporter files.  If you cringe hard-coding a full path to a specific version of the gem, you can also copy the +cucumber_loader+ file into your project and require it directly -- the contents are version-agnostic and are not likely to change in future releases.
 
 == Environment Variables
 
@@ -63,8 +58,8 @@ You can get the CI::Reporter source using Git, in any of the following ways:
     git clone git://git.caldersphere.net/ci_reporter.git
     git clone git://github.com/nicksieger/ci_reporter.git
 
-You can also download a tarball of the latest CI::Reporter source at http://github.com/nicksieger/ci_reporter/tree/master.
+You can also download a tarball of the latest CI::Reporter source at http://github.com/nicksieger/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>.
+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-2010 Nick Sieger <nicksieger@gmail.com>.

data/Rakefile

@@ -1,6 +1,3 @@
-require 'spec/rake/spectask'
-require 'spec/rake/verify_rcov'
-
 MANIFEST = FileList["History.txt", "Manifest.txt", "README.txt", "LICENSE.txt", "Rakefile",
   "*.rake", "lib/**/*.rb", "spec/**/*.rb", "tasks/**/*.rake"]
 
@@ -23,6 +20,12 @@ begin
   end
   hoe.spec.files = MANIFEST
   hoe.spec.dependencies.delete_if { |dep| dep.name == "hoe" }
+  hoe.spec.rdoc_options += ["-SHN", "-f", "darkfish"]
+
+  task :gemspec do
+    File.open("#{hoe.name}.gemspec", "w") {|f| f << hoe.spec.to_ruby }
+  end
+  task :package => :gemspec
 rescue LoadError
   puts "You really need Hoe installed to be able to package this gem"
 end
@@ -31,6 +34,7 @@ end
 # !@#$ no easy way to empty the default list of prerequisites
 # Leave my tasks alone, Hoe
 %w(default spec rcov).each do |task|
+  next unless Rake::Task.task_defined?(task)
   Rake::Task[task].prerequisites.clear
   Rake::Task[task].actions.clear
 end
@@ -42,21 +46,36 @@ else
   task :default => :rcov
 end
 
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ["--diff", "unified"]
+RSpecTask = begin
+  require 'rspec/core/rake_task'
+  @spec_bin = 'rspec'
+  RSpec::Core::RakeTask
+rescue LoadError
+  require 'spec/rake/spectask'
+  @spec_bin = 'spec'
+  Spec::Rake::SpecTask
+end
+
+RSpecTask.new do |t|
 end
 
-Spec::Rake::SpecTask.new("spec:rcov") do |t|
-  t.rcov_opts << '--exclude gems/*'
+RSpecTask.new("spec:rcov") do |t|
+  t.rcov_opts = ['--exclude gems/*']
   t.rcov = true
 end
-# so we don't confuse autotest
-RCov::VerifyTask.new(:rcov) do |t|
-  # Can't get threshold up to 100 unless RSpec backwards compatibility
-  # code is dropped
-  t.threshold = 98
-  t.require_exact_threshold = false
+
+begin
+  require 'spec/rake/verify_rcov'
+  # so we don't confuse autotest
+  RCov::VerifyTask.new(:rcov) do |t|
+    # Can't get threshold up to 100 unless RSpec backwards compatibility
+    # code is dropped
+    t.threshold = 95
+    t.require_exact_threshold = false
+  end
+rescue LoadError
 end
+
 task "spec:rcov" do
   rm_f "Manifest.txt"
 end
@@ -66,17 +85,17 @@ task :generate_output do
   rm_rf "acceptance/reports"
   ENV['CI_REPORTS'] = "acceptance/reports"
   begin
-    `ruby -Ilib acceptance/test_unit_example_test.rb` rescue nil
-    `ruby -Ilib -S spec --require ci/reporter/rake/rspec_loader --format CI::Reporter::RSpec acceptance/rspec_example_spec.rb` rescue nil
-    `ruby -Ilib -rci/reporter/rake/cucumber_loader -S cucumber --format CI::Reporter::Cucumber acceptance/cucumber` rescue nil
+    `ruby -Ilib -rubygems -rci/reporter/rake/test_unit_loader acceptance/test_unit_example_test.rb` rescue puts "Warning: #{$!}"
+    `ruby -Ilib -rubygems -S #{@spec_bin} --require ci/reporter/rake/rspec_loader --format CI::Reporter::RSpec acceptance/rspec_example_spec.rb` rescue puts "Warning: #{$!}"
+    `ruby -Ilib -rubygems -rci/reporter/rake/cucumber_loader -S cucumber --format CI::Reporter::Cucumber acceptance/cucumber` rescue puts "Warning: #{$!}"
   ensure
     ENV.delete 'CI_REPORTS'
   end
 end
 task :acceptance => :generate_output
 
-Spec::Rake::SpecTask.new(:acceptance_spec) do |t|
-  t.spec_files = FileList['acceptance/verification_spec.rb']
+RSpecTask.new(:acceptance_spec) do |t|
+  t.pattern = FileList['acceptance/verification_spec.rb']
 end
 task :acceptance => :acceptance_spec
 

data/lib/ci/reporter/cucumber.rb

@@ -3,17 +3,10 @@
 # software license details.
 
 require 'ci/reporter/core'
-tried_gem = false
+require 'cucumber'
 begin
-  require 'cucumber'
   require 'cucumber/ast/visitor'
 rescue LoadError
-  unless tried_gem
-    tried_gem = true
-    require 'rubygems'
-    gem 'cucumber'
-    retry
-  end
 end
 
 module CI
@@ -46,53 +39,81 @@ module CI
       end
     end
 
-    class Cucumber < ::Cucumber::Ast::Visitor
-
-      attr_accessor :test_suite, :report_manager, :feature_name
+    class Cucumber
+      attr_accessor :report_manager, :test_suite, :name
 
       def initialize(step_mother, io, options)
-        self.report_manager = ReportManager.new("features")
-        super(step_mother)
+        @report_manager = ReportManager.new("features")
       end
 
-      def visit_feature_name(name)
-        self.feature_name = name.split("\n").first
-        super
+      def before_feature(feature)
+        self.test_suite = TestSuite.new(@name)
+        test_suite.start
       end
 
-      def visit_feature_element(feature_element)
-        self.test_suite = TestSuite.new("#{feature_name} #{feature_element.instance_variable_get("@name")}")
-        test_suite.start
+      def after_feature(feature)
+        test_suite.name = @name
+        test_suite.finish
+        report_manager.write_report(@test_suite)
+        @test_suite = nil
+      end
 
-        return_value = super
+      def before_background(*args)
+      end
 
-        test_suite.finish
-        report_manager.write_report(test_suite)
-        self.test_suite = nil
+      def after_background(*args)
+      end
 
-        return_value
+      def feature_name(keyword, name)
+        @name = (name || "Unnamed feature").split("\n").first
       end
 
-      def visit_step(step)
-        test_case = TestCase.new(step.name)
-        test_case.start
+      def scenario_name(keyword, name, *args)
+        @scenario = (name || "Unnamed scenario").split("\n").first
+      end
 
-        return_value = super
+      def before_steps(steps)
+        @test_case = TestCase.new(@scenario)
+        @test_case.start
+      end
 
-        test_case.finish
+      def after_steps(steps)
+        @test_case.finish
 
-        case step.status
+        case steps.status
         when :pending, :undefined
-          test_case.name = "#{test_case.name} (PENDING)"
+          @test_case.name = "#{@test_case.name} (PENDING)"
         when :skipped
-          test_case.name = "#{test_case.name} (SKIPPED)"
+          @test_case.name = "#{@test_case.name} (SKIPPED)"
         when :failed
-          test_case.failures << CucumberFailure.new(step)
+          @test_case.failures << CucumberFailure.new(steps)
         end
 
-        test_suite.testcases << test_case
+        test_suite.testcases << @test_case
+        @test_case = nil
+      end
 
-        return_value
+      def before_examples(*args)
+        @header_row = true
+      end
+
+      def after_examples(*args)
+      end
+
+      def before_table_row(table_row)
+        @test_case = TestCase.new("#@scenario (outline: #{table_row.name})")
+        @test_case.start
+      end
+
+      def after_table_row(table_row)
+        if @header_row
+          @header_row = false
+          return
+        end
+        @test_case.finish
+        @test_case.failures << CucumberFailure.new(table_row) if table_row.failed?
+        test_suite.testcases << @test_case
+        @test_case = nil
       end
     end
   end

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

@@ -2,6 +2,8 @@
 # See the file LICENSE.txt included with the distribution for
 # software license details.
 
+require File.expand_path('../utils', __FILE__)
+
 namespace :ci do
   namespace :setup do
     task :cucumber_report_cleanup do
@@ -9,9 +11,9 @@ namespace :ci do
     end
 
     task :cucumber => :cucumber_report_cleanup do
-      spec_opts = ["--require", "#{File.dirname(__FILE__)}/cucumber_loader.rb",
+      cuke_opts = ["--require", CI::Reporter.maybe_quote_filename("#{File.dirname(__FILE__)}/cucumber_loader.rb"),
         "--format", "CI::Reporter::Cucumber"].join(" ")
-      ENV["CUCUMBER_OPTS"] = "#{ENV['CUCUMBER_OPTS']} #{spec_opts}"
+      ENV["CUCUMBER_OPTS"] = "#{ENV['CUCUMBER_OPTS']} #{cuke_opts}"
     end
   end
 end

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

@@ -2,6 +2,8 @@
 # See the file LICENSE.txt included with the distribution for
 # software license details.
 
+require File.expand_path('../utils', __FILE__)
+
 namespace :ci do
   namespace :setup do
     task :spec_report_cleanup do
@@ -9,13 +11,13 @@ namespace :ci do
     end
 
     task :rspec => :spec_report_cleanup do
-      spec_opts = ["--require", "#{File.dirname(__FILE__)}/rspec_loader.rb",
+      spec_opts = ["--require", CI::Reporter.maybe_quote_filename("#{File.dirname(__FILE__)}/rspec_loader.rb"),
         "--format", "CI::Reporter::RSpec"].join(" ")
       ENV["SPEC_OPTS"] = "#{ENV['SPEC_OPTS']} #{spec_opts}"
     end
 
     task :rspecdoc => :spec_report_cleanup do
-      spec_opts = ["--require", "#{File.dirname(__FILE__)}/rspec_loader.rb",
+      spec_opts = ["--require", CI::Reporter.maybe_quote_filename("#{File.dirname(__FILE__)}/rspec_loader.rb"),
         "--format", "CI::Reporter::RSpecDoc"].join(" ")
       ENV["SPEC_OPTS"] = "#{ENV['SPEC_OPTS']} #{spec_opts}"
     end

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

@@ -2,11 +2,14 @@
 # See the file LICENSE.txt included with the distribution for
 # software license details.
 
+require File.expand_path('../utils', __FILE__)
+
 namespace :ci do
   namespace :setup do
     task :testunit do
       rm_rf ENV["CI_REPORTS"] || "test/reports"
-      ENV["TESTOPTS"] = "#{ENV["TESTOPTS"]} #{File.dirname(__FILE__)}/test_unit_loader.rb"
+      test_loader = CI::Reporter.maybe_quote_filename "#{File.dirname(__FILE__)}/test_unit_loader.rb"
+      ENV["TESTOPTS"] = "#{ENV["TESTOPTS"]} #{test_loader}"
     end
   end
 end

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

@@ -0,0 +1,14 @@
+# Copyright (c) 2006-2010 Nick Sieger <nicksieger@gmail.com>
+# See the file LICENSE.txt included with the distribution for
+# software license details.
+
+module CI
+  module Reporter
+    def self.maybe_quote_filename(fn)
+      if fn =~ /\s/
+        fn = %{"#{fn}"}
+      end
+      fn
+    end
+  end
+end

data/lib/ci/reporter/rspec.rb

@@ -3,26 +3,36 @@
 # software license details.
 
 require 'ci/reporter/core'
-tried_gem = false
-begin
-  require 'spec'
-  require 'spec/runner/formatter/progress_bar_formatter'
-  require 'spec/runner/formatter/specdoc_formatter'
-rescue LoadError
-  unless tried_gem
-    tried_gem = true
-    require 'rubygems'
-    gem 'rspec'
-    retry
-  end
-end
 
 module CI
   module Reporter
+    module RSpecFormatters
+      begin
+        require 'rspec/core/formatters/base_formatter'
+        require 'rspec/core/formatters/progress_formatter'
+        require 'rspec/core/formatters/documentation_formatter'
+        BaseFormatter = ::RSpec::Core::Formatters::BaseFormatter
+        ProgressFormatter = ::RSpec::Core::Formatters::ProgressFormatter
+        DocFormatter = ::RSpec::Core::Formatters::DocumentationFormatter
+      rescue LoadError => first_error
+        begin
+          require 'spec/runner/formatter/progress_bar_formatter'
+          require 'spec/runner/formatter/specdoc_formatter'
+          BaseFormatter = ::Spec::Runner::Formatter::BaseFormatter
+          ProgressFormatter = ::Spec::Runner::Formatter::ProgressBarFormatter
+          DocFormatter = ::Spec::Runner::Formatter::SpecdocFormatter
+        rescue LoadError
+          raise first_error
+        end
+      end
+    end
+
     # Wrapper around a <code>RSpec</code> error or failure to be used by the test suite to interpret results.
     class RSpecFailure
+      attr_reader :exception
       def initialize(failure)
         @failure = failure
+        @exception = failure.exception
       end
 
       def failure?
@@ -30,21 +40,32 @@ module CI
       end
 
       def error?
-        !@failure.expectation_not_met?
+        !failure?
+      end
+
+      def name() exception.class.name end
+      def message() exception.message end
+      def location() (exception.backtrace || ["No backtrace available"]).join("\n") end
+    end
+
+    class RSpec2Failure < RSpecFailure
+      def initialize(example)
+        @example = example
+        @exception = @example.execution_result[:exception_encountered]
       end
 
-      def name() @failure.exception.class.name end
-      def message() @failure.exception.message end
-      def location() @failure.exception.backtrace.join("\n") end
+      def failure?
+        exception.is_a?(::RSpec::Expectations::ExpectationNotMetError)
+      end
     end
 
     # Custom +RSpec+ formatter used to hook into the spec runs and capture results.
-    class RSpec < Spec::Runner::Formatter::BaseFormatter
+    class RSpec < RSpecFormatters::BaseFormatter
       attr_accessor :report_manager
       attr_accessor :formatter
       def initialize(*args)
         super
-        @formatter ||= Spec::Runner::Formatter::ProgressBarFormatter.new(*args)
+        @formatter ||= RSpecFormatters::ProgressFormatter.new(*args)
         @report_manager = ReportManager.new("spec")
         @suite = nil
       end
@@ -62,45 +83,53 @@ module CI
       # Compatibility with rspec < 1.2.4
       def add_example_group(example_group)
         @formatter.add_example_group(example_group)
-        new_suite(example_group.description)
+        new_suite(description_for(example_group))
       end
 
       # rspec >= 1.2.4
       def example_group_started(example_group)
         @formatter.example_group_started(example_group)
-        new_suite(example_group.description)
+        new_suite(description_for(example_group))
       end
 
-      def example_started(name)
-        @formatter.example_started(name)
-        name = name.description if name.respond_to?(:description)
-        spec = TestCase.new name
+      def example_started(name_or_example)
+        @formatter.example_started(name_or_example)
+        spec = TestCase.new
         @suite.testcases << spec
         spec.start
       end
 
-      def example_failed(name, counter, failure)
-        @formatter.example_failed(name, counter, failure)
+      def example_failed(name_or_example, *rest)
+        @formatter.example_failed(name_or_example, *rest)
+
         # In case we fail in before(:all)
-        if @suite.testcases.empty?
-          example_started(name)
+        example_started(name_or_example) if @suite.testcases.empty?
+
+        if name_or_example.respond_to?(:execution_result) # RSpec 2
+          failure = RSpec2Failure.new(name_or_example)
+        else
+          failure = RSpecFailure.new(rest[1]) # example_failed(name, counter, failure) in RSpec 1
         end
+
         spec = @suite.testcases.last
         spec.finish
-        spec.failures << RSpecFailure.new(failure)
+        spec.name = description_for(name_or_example)
+        spec.failures << failure
       end
 
-      def example_passed(name)
-        @formatter.example_passed(name)
+      def example_passed(name_or_example)
+        @formatter.example_passed(name_or_example)
         spec = @suite.testcases.last
         spec.finish
+        spec.name = description_for(name_or_example)
       end
 
       def example_pending(*args)
         @formatter.example_pending(*args)
+        name = description_for(args[0])
         spec = @suite.testcases.last
         spec.finish
-        spec.name = "#{spec.name} (PENDING)"
+        spec.name = "#{name} (PENDING)"
         spec.skipped = true
       end
 
@@ -126,6 +155,18 @@ module CI
       end
 
       private
+      def description_for(name_or_example)
+        if name_or_example.respond_to?(:full_description)
+          name_or_example.full_description
+        elsif name_or_example.respond_to?(:metadata)
+          name_or_example.metadata[:example_group][:full_description]
+        elsif name_or_example.respond_to?(:description)
+          name_or_example.description
+        else
+          "UNKNOWN"
+        end
+      end
+
       def write_report
         @suite.finish
         @report_manager.write_report(@suite)
@@ -140,7 +181,7 @@ module CI
 
     class RSpecDoc < RSpec
       def initialize(*args)
-        @formatter = Spec::Runner::Formatter::SpecdocFormatter.new(*args)
+        @formatter = RSpecFormatters::DocFormatter.new(*args)
         super
       end
     end

data/lib/ci/reporter/test_suite.rb

@@ -66,12 +66,6 @@ module CI
 
       # Creates the xml builder instance used to create the report xml document.
       def create_builder
-        begin
-          require 'rubygems'
-          gem 'builder'
-        rescue LoadError
-        end
-
         require 'builder'
         # :escape_attrs is obsolete in a newer version, but should do no harm
         Builder::XmlMarkup.new(:indent => 2, :escape_attrs => true)

data/lib/ci/reporter/version.rb

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

data/spec/ci/reporter/cucumber_spec.rb

@@ -73,54 +73,69 @@ describe "The Cucumber reporter" do
 
     it "should record the feature name when a new feature is visited" do
       cucumber = new_instance
-      cucumber.visit_feature_name("Some feature name")
-      cucumber.feature_name.should == "Some feature name"
+      cucumber.feature_name(nil, "Some feature name")
+      cucumber.name.should == "Some feature name"
     end
 
     it "should record only the first line of a feature name" do
       cucumber = new_instance
-      cucumber.visit_feature_name("Some feature name\nLonger description")
-      cucumber.feature_name.should == "Some feature name"
+      cucumber.feature_name(nil, "Some feature name\nLonger description")
+      cucumber.name.should == "Some feature name"
     end
 
-    describe "when visiting a new scenario" do
+    context "applied to a feature" do
       before(:each) do
         @cucumber = new_instance
-        @cucumber.visit_feature_name("Demo feature")
+        @cucumber.feature_name(nil, "Demo feature")
 
-        @test_suite = mock("test_suite", :start => nil, :finish => nil)
+        @test_suite = mock("test_suite", :start => nil, :finish => nil, :name= => nil)
         CI::Reporter::TestSuite.stub!(:new).and_return(@test_suite)
 
-        @feature_element = mock("feature_element", :accept => true)
+        @feature = mock("feature")
 
         @report_manager.stub!(:write_report)
       end
 
-      it "should create a new test suite" do
-        # FIXME: @name is feature_element purely as a by-product of the
-        # mocking framework implementation.  But then again, using
-        # +instance_variable_get+ in the first place is a bit icky.
-        CI::Reporter::TestSuite.should_receive(:new).with("Demo feature feature_element")
-        @cucumber.visit_feature_element(@feature_element)
-      end
+      context "before" do
+        it "should create a new test suite" do
+          CI::Reporter::TestSuite.should_receive(:new).with(/Demo feature/)
+          @cucumber.before_feature(@feature)
+        end
 
-      it "should indicate that the test suite has started" do
-        @test_suite.should_receive(:start)
-        @cucumber.visit_feature_element(@feature_element)
+        it "should indicate that the test suite has started" do
+          @test_suite.should_receive(:start)
+          @cucumber.before_feature(@feature)
+        end
       end
 
-      it "should indicate that the test suite has finished" do
-        @test_suite.should_receive(:finish)
-        @cucumber.visit_feature_element(@feature_element)
-      end
+      context "after" do
+        before :each do
+          @cucumber = new_instance
+          @cucumber.feature_name(nil, "Demo feature")
+
+          @test_suite = mock("test_suite", :start => nil, :finish => nil, :name= => nil)
+          CI::Reporter::TestSuite.stub!(:new).and_return(@test_suite)
+
+          @feature = mock("feature")
+
+          @report_manager.stub!(:write_report)
 
-      it "should ask the report manager to write a report" do
-        @report_manager.should_receive(:write_report).with(@test_suite)
-        @cucumber.visit_feature_element(@feature_element)
+          @cucumber.before_feature(@feature)
+        end
+
+        it "should indicate that the test suite has finished" do
+          @test_suite.should_receive(:finish)
+          @cucumber.after_feature(@feature)
+        end
+
+        it "should ask the report manager to write a report" do
+          @report_manager.should_receive(:write_report).with(@test_suite)
+          @cucumber.after_feature(@feature)
+        end
       end
     end
 
-    describe "when visiting a step inside a scenario" do
+    context "inside a scenario" do
       before(:each) do
         @testcases = []
 
@@ -132,48 +147,57 @@ describe "The Cucumber reporter" do
         @test_case = mock("test_case", :start => nil, :finish => nil, :name => "Step Name")
         CI::Reporter::TestCase.stub!(:new).and_return(@test_case)
 
-        @step = mock("step", :accept => true, :status => :passed)
+        @step = mock("step", :status => :passed)
         @step.stub!(:name).and_return("Step Name")
       end
 
-      it "should create a new test case" do
-        CI::Reporter::TestCase.should_receive(:new).with("Step Name")
-        @cucumber.visit_step(@step)
-      end
+      context "before steps" do
+        it "should create a new test case" do
+          CI::Reporter::TestCase.should_receive(:new).with("Step Name")
+          @cucumber.scenario_name(nil, "Step Name")
+          @cucumber.before_steps(@step)
+        end
 
-      it "should indicate that the test case has started" do
-        @test_case.should_receive(:start)
-        @cucumber.visit_step(@step)
+        it "should indicate that the test case has started" do
+          @test_case.should_receive(:start)
+          @cucumber.before_steps(@step)
+        end
       end
 
-      it "should indicate that the test case has finished" do
-        @test_case.should_receive(:finish)
-        @cucumber.visit_step(@step)
-      end
+      context "after steps" do
+        before :each do
+          @cucumber.before_steps(@step)
+        end
 
-      it "should add the test case to the suite's list of cases" do
-        @testcases.should be_empty
-        @cucumber.visit_step(@step)
-        @testcases.should_not be_empty
-        @testcases.first.should == @test_case
-      end
+        it "should indicate that the test case has finished" do
+          @test_case.should_receive(:finish)
+          @cucumber.after_steps(@step)
+        end
 
-      it "should alter the name of a test case that is pending to include '(PENDING)'" do
-        @step.stub!(:status).and_return(:pending)
-        @test_case.should_receive(:name=).with("Step Name (PENDING)")
-        @cucumber.visit_step(@step)
-      end
+        it "should add the test case to the suite's list of cases" do
+          @testcases.should be_empty
+          @cucumber.after_steps(@step)
+          @testcases.should_not be_empty
+          @testcases.first.should == @test_case
+        end
 
-      it "should alter the name of a test case that is undefined to include '(PENDING)'" do
-        @step.stub!(:status).and_return(:undefined)
-        @test_case.should_receive(:name=).with("Step Name (PENDING)")
-        @cucumber.visit_step(@step)
-      end
+        it "should alter the name of a test case that is pending to include '(PENDING)'" do
+          @step.stub!(:status).and_return(:pending)
+          @test_case.should_receive(:name=).with("Step Name (PENDING)")
+          @cucumber.after_steps(@step)
+        end
+
+        it "should alter the name of a test case that is undefined to include '(PENDING)'" do
+          @step.stub!(:status).and_return(:undefined)
+          @test_case.should_receive(:name=).with("Step Name (PENDING)")
+          @cucumber.after_steps(@step)
+        end
 
-      it "should alter the name of a test case that was skipped to include '(SKIPPED)'" do
-        @step.stub!(:status).and_return(:skipped)
-        @test_case.should_receive(:name=).with("Step Name (SKIPPED)")
-        @cucumber.visit_step(@step)
+        it "should alter the name of a test case that was skipped to include '(SKIPPED)'" do
+          @step.stub!(:status).and_return(:skipped)
+          @test_case.should_receive(:name=).with("Step Name (SKIPPED)")
+          @cucumber.after_steps(@step)
+        end
       end
 
       describe "that fails" do
@@ -183,18 +207,20 @@ describe "The Cucumber reporter" do
           @failures = []
           @test_case.stub!(:failures).and_return(@failures)
 
+          @cucumber.before_steps(@step)
+
           @cucumber_failure = mock("cucumber_failure")
           CI::Reporter::CucumberFailure.stub!(:new).and_return(@cucumber_failure)
         end
 
         it "should create a new cucumber failure with that step" do
           CI::Reporter::CucumberFailure.should_receive(:new).with(@step)
-          @cucumber.visit_step(@step)
+          @cucumber.after_steps(@step)
         end
 
         it "should add the failure to the suite's list of failures" do
           @failures.should be_empty
-          @cucumber.visit_step(@step)
+          @cucumber.after_steps(@step)
           @failures.should_not be_empty
           @failures.first.should == @cucumber_failure
         end

data/spec/ci/reporter/rspec_spec.rb

@@ -10,10 +10,11 @@ describe "The RSpec reporter" do
     @error = mock("error")
     @error.stub!(:expectation_not_met?).and_return(false)
     @error.stub!(:pending_fixed?).and_return(false)
+    @error.stub!(:exception).and_return(StandardError.new)
     @report_mgr = mock("report manager")
     @options = mock("options")
     @args = [@options, StringIO.new("")]
-    @args.shift if Spec::VERSION::MAJOR == 1 && Spec::VERSION::MINOR < 1
+    @args.shift unless defined?(::Spec) && ::Spec::VERSION::MAJOR == 1 && ::Spec::VERSION::MINOR >= 1
     @fmt = CI::Reporter::RSpec.new *@args
     @fmt.report_manager = @report_mgr
     @formatter = mock("formatter")
@@ -22,12 +23,12 @@ describe "The RSpec reporter" do
 
   it "should use a progress bar formatter by default" do
     fmt = CI::Reporter::RSpec.new *@args
-    fmt.formatter.should be_instance_of(Spec::Runner::Formatter::ProgressBarFormatter)
+    fmt.formatter.should be_instance_of(CI::Reporter::RSpecFormatters::ProgressFormatter)
   end
 
   it "should use a specdoc formatter for RSpecDoc" do
     fmt = CI::Reporter::RSpecDoc.new *@args
-    fmt.formatter.should be_instance_of(Spec::Runner::Formatter::SpecdocFormatter)
+    fmt.formatter.should be_instance_of(CI::Reporter::RSpecFormatters::DocFormatter)
   end
 
   it "should create a test suite with one success, one failure, and one pending" do

data/spec/spec_helper.rb

@@ -3,8 +3,11 @@
 # software license details.
 
 require 'rubygems'
-gem 'rspec'
-require 'spec'
+begin
+  require 'rspec'
+rescue LoadError
+  require 'spec'
+end
 
 unless defined?(CI_REPORTER_LIB)
   CI_REPORTER_LIB = File.expand_path(File.dirname(__FILE__) + "/../lib")

metadata

@@ -3,34 +3,50 @@ name: ci_reporter
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 1
-  - 6
-  - 2
-  version: 1.6.2
+    - 1
+    - 6
+    - 3
+  version: 1.6.3
 platform: ruby
 authors: 
-- Nick Sieger
+  - Nick Sieger
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 -05:00
+date: 2010-10-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: builder
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
-  type: :runtime
-  version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: builder
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 2
+              - 1
+              - 2
+            version: 2.1.2
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rubyforge
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 2
+              - 0
+              - 4
+            version: 2.0.4
+    type: :development
+    version_requirements: *id002
 description: CI::Reporter is an add-on to Test::Unit, RSpec and Cucumber that allows you to generate XML reports of your test, spec and/or feature runs. The resulting files can be read by a continuous integration system that understands Ant's JUnit report XML format, thus allowing your CI system to track test/spec successes and failures.
 email: nick@nicksieger.com
 executables: []
@@ -38,75 +54,81 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
-- LICENSE.txt
+  - History.txt
+  - Manifest.txt
+  - README.txt
+  - LICENSE.txt
 files: 
-- History.txt
-- Manifest.txt
-- README.txt
-- LICENSE.txt
-- Rakefile
-- stub.rake
-- lib/ci/reporter/core.rb
-- lib/ci/reporter/cucumber.rb
-- lib/ci/reporter/rake/cucumber.rb
-- lib/ci/reporter/rake/cucumber_loader.rb
-- lib/ci/reporter/rake/rspec.rb
-- lib/ci/reporter/rake/rspec_loader.rb
-- lib/ci/reporter/rake/test_unit.rb
-- lib/ci/reporter/rake/test_unit_loader.rb
-- lib/ci/reporter/report_manager.rb
-- lib/ci/reporter/rspec.rb
-- lib/ci/reporter/test_suite.rb
-- lib/ci/reporter/test_unit.rb
-- lib/ci/reporter/version.rb
-- spec/ci/reporter/cucumber_spec.rb
-- spec/ci/reporter/output_capture_spec.rb
-- spec/ci/reporter/rake/rake_tasks_spec.rb
-- spec/ci/reporter/report_manager_spec.rb
-- spec/ci/reporter/rspec_spec.rb
-- spec/ci/reporter/test_suite_spec.rb
-- spec/ci/reporter/test_unit_spec.rb
-- spec/spec_helper.rb
-- tasks/ci_reporter.rake
+  - History.txt
+  - Manifest.txt
+  - README.txt
+  - LICENSE.txt
+  - Rakefile
+  - stub.rake
+  - lib/ci/reporter/core.rb
+  - lib/ci/reporter/cucumber.rb
+  - lib/ci/reporter/report_manager.rb
+  - lib/ci/reporter/rspec.rb
+  - lib/ci/reporter/test_suite.rb
+  - lib/ci/reporter/test_unit.rb
+  - lib/ci/reporter/version.rb
+  - lib/ci/reporter/rake/cucumber.rb
+  - lib/ci/reporter/rake/cucumber_loader.rb
+  - lib/ci/reporter/rake/rspec.rb
+  - lib/ci/reporter/rake/rspec_loader.rb
+  - lib/ci/reporter/rake/test_unit.rb
+  - lib/ci/reporter/rake/test_unit_loader.rb
+  - lib/ci/reporter/rake/utils.rb
+  - spec/spec_helper.rb
+  - spec/ci/reporter/cucumber_spec.rb
+  - spec/ci/reporter/output_capture_spec.rb
+  - spec/ci/reporter/report_manager_spec.rb
+  - spec/ci/reporter/rspec_spec.rb
+  - spec/ci/reporter/test_suite_spec.rb
+  - spec/ci/reporter/test_unit_spec.rb
+  - spec/ci/reporter/rake/rake_tasks_spec.rb
+  - tasks/ci_reporter.rake
 has_rdoc: true
 homepage: http://caldersphere.rubyforge.org/ci_reporter
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+  - --main
+  - README.txt
+  - -SHN
+  - -f
+  - darkfish
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: caldersphere
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: CI::Reporter allows you to generate reams of XML for use with continuous integration systems.
 test_files: 
-- spec/ci/reporter/cucumber_spec.rb
-- spec/ci/reporter/output_capture_spec.rb
-- spec/ci/reporter/rake/rake_tasks_spec.rb
-- spec/ci/reporter/report_manager_spec.rb
-- spec/ci/reporter/rspec_spec.rb
-- spec/ci/reporter/test_suite_spec.rb
-- spec/ci/reporter/test_unit_spec.rb
+  - spec/ci/reporter/cucumber_spec.rb
+  - spec/ci/reporter/output_capture_spec.rb
+  - spec/ci/reporter/report_manager_spec.rb
+  - spec/ci/reporter/rspec_spec.rb
+  - spec/ci/reporter/test_suite_spec.rb
+  - spec/ci/reporter/test_unit_spec.rb
+  - spec/ci/reporter/rake/rake_tasks_spec.rb