From c53739faa1ae7745e22c7e86b2ba919517d08048 Mon Sep 17 00:00:00 2001 From: Michael Giambalvo Date: Wed, 22 Jun 2011 17:19:00 -0700 Subject: [PATCH] Adding a base rspec formatter so we don't get double text output when using custom documentation formatters --- lib/ci/reporter/rake/rspec.rb | 6 ++++++ lib/ci/reporter/rspec.rb | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/lib/ci/reporter/rake/rspec.rb b/lib/ci/reporter/rake/rspec.rb index 291c719..f89e546 100644 --- a/lib/ci/reporter/rake/rspec.rb +++ b/lib/ci/reporter/rake/rspec.rb @@ -21,5 +21,11 @@ "--format", "CI::Reporter::RSpecDoc"].join(" ") ENV["SPEC_OPTS"] = "#{ENV['SPEC_OPTS']} #{spec_opts}" end + + task :rspecbase => :spec_report_cleanup do + spec_opts = ["--require", CI::Reporter.maybe_quote_filename("#{File.dirname(__FILE__)}/rspec_loader.rb"), + "--format", "CI::Reporter::RSpecBase"].join(" ") + ENV["SPEC_OPTS"] = "#{ENV['SPEC_OPTS']} #{spec_opts}" + end end end diff --git a/lib/ci/reporter/rspec.rb b/lib/ci/reporter/rspec.rb index 61b111d..b3aa0c5 100644 --- a/lib/ci/reporter/rspec.rb +++ b/lib/ci/reporter/rspec.rb @@ -205,5 +205,12 @@ def initialize(*args) super end end + + class RSpecBase < RSpec + def initialize(*args) + @formatter = RSpecFormatters::BaseFormatter.new(*args) + super + end + end end end