rspec 1.0.8 → 1.1.0

data/spec/spec/runner/output_one_time_fixture.rb

@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "Running an Example" do
+  it "should not output twice" do
+    true.should be_true
+  end
+end

data/spec/spec/runner/output_one_time_fixture_runner.rb

@@ -0,0 +1,8 @@
+dir = File.dirname(__FILE__)
+require "#{dir}/../../spec_helper"
+
+triggering_double_output = rspec_options
+options = Spec::Runner::OptionParser.parse(
+  ["#{dir}/output_one_time_fixture.rb"], $stderr, $stdout
+)
+Spec::Runner::CommandLine.run(options)

data/spec/spec/runner/output_one_time_spec.rb

@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Runner
+    describe CommandLine do
+      it "should not output twice" do
+        dir = File.dirname(__FILE__)
+        Dir.chdir("#{dir}/../../..") do
+          output =`ruby #{dir}/output_one_time_fixture_runner.rb`
+          output.should include("1 example, 0 failures")
+          output.should_not include("0 examples, 0 failures")
+        end
+      end
+    end
+  end
+end

data/spec/spec/runner/quiet_backtrace_tweaker_spec.rb

@@ -10,13 +10,13 @@ module Spec
 
       it "should not barf on nil backtrace" do
         lambda do
-          @tweaker.tweak_backtrace(@error, "spec name")
+          @tweaker.tweak_backtrace(@error)
         end.should_not raise_error
       end
 
       it "should remove anything from textmate ruby bundle" do
         @error.set_backtrace(["/Applications/TextMate.app/Contents/SharedSupport/Bundles/Ruby.tmbundle/Support/tmruby.rb:147"])
-        @tweaker.tweak_backtrace(@error, "spec name")
+        @tweaker.tweak_backtrace(@error)
         @error.backtrace.should be_empty
       end
 
@@ -24,7 +24,7 @@ module Spec
         ["expectations", "mocks", "runner"].each do |child|
           element="/lib/spec/#{child}/anything.rb"
           @error.set_backtrace([element])
-          @tweaker.tweak_backtrace(@error, "spec name")
+          @tweaker.tweak_backtrace(@error)
           unless (@error.backtrace.empty?)
             raise("Should have tweaked away '#{element}'")
           end
@@ -34,7 +34,7 @@ module Spec
       it "should remove mock_frameworks/rspec" do
         element = "mock_frameworks/rspec"
         @error.set_backtrace([element])
-        @tweaker.tweak_backtrace(@error, "spec name")
+        @tweaker.tweak_backtrace(@error)
         unless (@error.backtrace.empty?)
           raise("Should have tweaked away '#{element}'")
         end
@@ -42,13 +42,13 @@ module Spec
 
       it "should remove bin spec" do
         @error.set_backtrace(["bin/spec:"])
-        @tweaker.tweak_backtrace(@error, "spec name")
+        @tweaker.tweak_backtrace(@error)
         @error.backtrace.should be_empty
       end
       
       it "should clean up double slashes" do
         @error.set_backtrace(["/a//b/c//d.rb"])
-        @tweaker.tweak_backtrace(@error, "spec name")
+        @tweaker.tweak_backtrace(@error)
         @error.backtrace.should include("/a/b/c/d.rb")
       end
     end

data/spec/spec/runner/reporter_spec.rb

@@ -2,203 +2,187 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Runner
-    
-    module ReporterSpecHelper
-      def setup
-        @io = StringIO.new
+    describe Reporter do
+      attr_reader :formatter_output, :options, :backtrace_tweaker, :formatter, :reporter, :example_group
+      before(:each) do
+        @formatter_output = StringIO.new
+        @options = Options.new(StringIO.new, StringIO.new)
         @backtrace_tweaker = stub("backtrace tweaker", :tweak_backtrace => nil)
-        @formatter = mock("formatter")
-        @reporter = Reporter.new([@formatter], @backtrace_tweaker)
+        options.backtrace_tweaker = backtrace_tweaker
+        @formatter = ::Spec::Runner::Formatter::BaseTextFormatter.new(options, formatter_output)
+        options.formatters << formatter
+        @reporter = Reporter.new(options)
+        @example_group = create_example_group("example_group")
+        reporter.add_example_group example_group
       end
 
       def failure
         Mocks::DuckTypeArgConstraint.new(:header, :exception)
       end
-      
-      def description(s)
-        Spec::DSL::Description.new(s)
+
+      def create_example_group(description_text)
+        example_group = Class.new(Spec::Example::ExampleGroup)
+        example_group.describe description_text
+        example_group
       end
-    end
-    
-    describe Reporter do
-      include ReporterSpecHelper
-      before(:each) {setup}
-      
-      it "should tell formatter when behaviour is added" do
-        @formatter.should_receive(:add_behaviour).with(description("behaviour"))
-        @reporter.add_behaviour(description("behaviour"))
+
+      it "should assign itself as the reporter to options" do
+        options.reporter.should equal(@reporter)
+      end
+
+      it "should tell formatter when example_group is added" do
+        formatter.should_receive(:add_example_group).with(example_group)
+        reporter.add_example_group(example_group)
       end
 
-      it "should handle multiple behaviours with same name" do
-        @formatter.should_receive(:add_behaviour).exactly(3).times
-        @formatter.should_receive(:example_started).exactly(3).times
-        @formatter.should_receive(:example_passed).exactly(3).times
-        @formatter.should_receive(:start_dump)
-        @formatter.should_receive(:close).with(no_args)
-        @formatter.should_receive(:dump_summary).with(anything(), 3, 0, 0)
-        @reporter.add_behaviour(description("behaviour"))
-        @reporter.example_started("spec 1")
-        @reporter.example_finished("spec 1")
-        @reporter.add_behaviour(description("behaviour"))
-        @reporter.example_started("spec 2")
-        @reporter.example_finished("spec 2")
-        @reporter.add_behaviour(description("behaviour"))
-        @reporter.example_started("spec 3")
-        @reporter.example_finished("spec 3")
-        @reporter.dump
+      it "should handle multiple example_groups with same name" do
+        formatter.should_receive(:add_example_group).exactly(3).times
+        formatter.should_receive(:example_started).exactly(3).times
+        formatter.should_receive(:example_passed).exactly(3).times
+        formatter.should_receive(:start_dump)
+        formatter.should_receive(:dump_pending)
+        formatter.should_receive(:close).with(no_args)
+        formatter.should_receive(:dump_summary).with(anything(), 3, 0, 0)
+        reporter.add_example_group(create_example_group("example_group"))
+        reporter.example_started("spec 1")
+        reporter.example_finished("spec 1")
+        reporter.add_example_group(create_example_group("example_group"))
+        reporter.example_started("spec 2")
+        reporter.example_finished("spec 2")
+        reporter.add_example_group(create_example_group("example_group"))
+        reporter.example_started("spec 3")
+        reporter.example_finished("spec 3")
+        reporter.dump
       end
 
       it "should handle multiple examples with the same name" do
         error=RuntimeError.new
-        @formatter.should_receive(:add_behaviour).exactly(2).times
-        @formatter.should_receive(:example_passed).with("example").exactly(2).times
-        @formatter.should_receive(:example_failed).with("example", 1, failure)
-        @formatter.should_receive(:example_failed).with("example", 2, failure)
-        @formatter.should_receive(:dump_failure).exactly(2).times
-        @formatter.should_receive(:start_dump)
-        @formatter.should_receive(:close).with(no_args)
-        @formatter.should_receive(:dump_summary).with(anything(), 4, 2, 0)
-        @backtrace_tweaker.should_receive(:tweak_backtrace).twice
-        @reporter.add_behaviour(description("behaviour"))
-        @reporter.example_finished("example")
-        @reporter.example_finished("example", error)
-        @reporter.add_behaviour(description("behaviour"))
-        @reporter.example_finished("example")
-        @reporter.example_finished("example", error)
-        @reporter.dump
+        passing = ExampleGroup.new("example")
+        failing = ExampleGroup.new("example")
+
+        formatter.should_receive(:add_example_group).exactly(2).times
+        formatter.should_receive(:example_passed).with(passing).exactly(2).times
+        formatter.should_receive(:example_failed).with(failing, 1, failure)
+        formatter.should_receive(:example_failed).with(failing, 2, failure)
+        formatter.should_receive(:dump_failure).exactly(2).times
+        formatter.should_receive(:start_dump)
+        formatter.should_receive(:dump_pending)
+        formatter.should_receive(:close).with(no_args)
+        formatter.should_receive(:dump_summary).with(anything(), 4, 2, 0)
+        backtrace_tweaker.should_receive(:tweak_backtrace).twice
+
+        reporter.add_example_group(create_example_group("example_group"))
+        reporter.example_finished(passing)
+        reporter.example_finished(failing, error)
+
+        reporter.add_example_group(create_example_group("example_group"))
+        reporter.example_finished(passing)
+        reporter.example_finished(failing, error)
+        reporter.dump
       end
 
       it "should push stats to formatter even with no data" do
-        @formatter.should_receive(:start_dump)
-        @formatter.should_receive(:dump_summary).with(anything(), 0, 0, 0)
-        @formatter.should_receive(:close).with(no_args)
-        @reporter.dump
+        formatter.should_receive(:start_dump)
+        formatter.should_receive(:dump_pending)
+        formatter.should_receive(:dump_summary).with(anything(), 0, 0, 0)
+        formatter.should_receive(:close).with(no_args)
+        reporter.dump
       end
-      
+
       it "should push time to formatter" do
-        @formatter.should_receive(:start).with(5)
-        @formatter.should_receive(:start_dump)
-        @formatter.should_receive(:close).with(no_args)
-        @formatter.should_receive(:dump_summary) do |time, a, b|
+        formatter.should_receive(:start).with(5)
+        formatter.should_receive(:start_dump)
+        formatter.should_receive(:dump_pending)
+        formatter.should_receive(:close).with(no_args)
+        formatter.should_receive(:dump_summary) do |time, a, b|
           time.to_s.should match(/[0-9].[0-9|e|-]+/)
         end
-        @reporter.start(5)
-        @reporter.end
-        @reporter.dump
-      end
-    end
-    
-    describe Reporter, "reporting one passing example" do
-      include ReporterSpecHelper
-      before(:each) {setup}
-
-      it "should tell formatter example passed" do
-        @formatter.should_receive(:example_passed)
-        @reporter.example_finished("example")
-      end
-      
-      it "should not delegate to backtrace tweaker" do
-        @formatter.should_receive(:example_passed)
-        @backtrace_tweaker.should_not_receive(:tweak_backtrace)
-        @reporter.example_finished("example")
+        reporter.start(5)
+        reporter.end
+        reporter.dump
       end
 
-      it "should account for passing example in stats" do
-        @formatter.should_receive(:example_passed)
-        @formatter.should_receive(:start_dump)
-        @formatter.should_receive(:dump_summary).with(anything(), 1, 0, 0)
-        @formatter.should_receive(:close).with(no_args)
-        @reporter.example_finished("example")
-        @reporter.dump
-      end
-    end
+      describe Reporter, "reporting one passing example" do
+        it "should tell formatter example passed" do
+          formatter.should_receive(:example_passed)
+          reporter.example_finished("example")
+        end
 
-    describe Reporter, "reporting one failing example" do
-      include ReporterSpecHelper
-      before(:each) {setup}
+        it "should not delegate to backtrace tweaker" do
+          formatter.should_receive(:example_passed)
+          backtrace_tweaker.should_not_receive(:tweak_backtrace)
+          reporter.example_finished("example")
+        end
 
-      it "should tell formatter that example failed" do
-        @formatter.should_receive(:example_failed)
-        @reporter.example_finished("example", RuntimeError.new)
-      end
-      
-      it "should delegate to backtrace tweaker" do
-        @formatter.should_receive(:example_failed)
-        @backtrace_tweaker.should_receive(:tweak_backtrace)
-        @reporter.example_finished("spec", RuntimeError.new)
+        it "should account for passing example in stats" do
+          formatter.should_receive(:example_passed)
+          formatter.should_receive(:start_dump)
+          formatter.should_receive(:dump_pending)
+          formatter.should_receive(:dump_summary).with(anything(), 1, 0, 0)
+          formatter.should_receive(:close).with(no_args)
+          reporter.example_finished("example")
+          reporter.dump
+        end
       end
 
-      it "should account for failing example in stats" do
-        @formatter.should_receive(:add_behaviour)
-        @formatter.should_receive(:example_failed).with("example", 1, failure)
-        @formatter.should_receive(:start_dump)
-        @formatter.should_receive(:dump_failure).with(1, anything())
-        @formatter.should_receive(:dump_summary).with(anything(), 1, 1, 0)
-        @formatter.should_receive(:close).with(no_args)
-        @reporter.add_behaviour(description("behaviour"))
-        @reporter.example_finished("example", RuntimeError.new)
-        @reporter.dump
-      end
-      
-    end
-    
-    describe Reporter, "reporting one pending example (Not Yet Implemented)" do
-      include ReporterSpecHelper
-      before(:each) {setup}
-
-      it "should tell formatter example is pending" do
-        @formatter.should_receive(:example_pending).with(description("behaviour"), "example", "Not Yet Implemented")
-        @formatter.should_receive(:add_behaviour).with(description("behaviour"))
-        @reporter.add_behaviour(description('behaviour'))
-        @reporter.example_finished("example", nil, nil, true)
-      end
+      describe Reporter, "reporting one failing example" do
+        it "should tell formatter that example failed" do
+          formatter.should_receive(:example_failed)
+          reporter.example_finished(example_group, RuntimeError.new)
+        end
 
-      it "should account for pending example in stats" do
-        @formatter.should_receive(:example_pending).with(description("behaviour"), "example", "Not Yet Implemented")
-        @formatter.should_receive(:start_dump)
-        @formatter.should_receive(:dump_summary).with(anything(), 1, 0, 1)
-        @formatter.should_receive(:add_behaviour).with(description("behaviour"))
-        @formatter.should_receive(:close).with(no_args)
-        @reporter.add_behaviour(description('behaviour'))
-        @reporter.example_finished("example", nil, nil, true)
-        @reporter.dump
-      end
-    end
+        it "should delegate to backtrace tweaker" do
+          formatter.should_receive(:example_failed)
+          backtrace_tweaker.should_receive(:tweak_backtrace)
+          reporter.example_finished(ExampleGroup.new("example"), RuntimeError.new)
+        end
 
-    describe Reporter, "reporting one pending example (ExamplePendingError)" do
-      include ReporterSpecHelper
-      before(:each) {setup}
+        it "should account for failing example in stats" do
+          example = ExampleGroup.new("example")
+          formatter.should_receive(:example_failed).with(example, 1, failure)
+          formatter.should_receive(:start_dump)
+          formatter.should_receive(:dump_pending)
+          formatter.should_receive(:dump_failure).with(1, anything())
+          formatter.should_receive(:dump_summary).with(anything(), 1, 1, 0)
+          formatter.should_receive(:close).with(no_args)
+          reporter.example_finished(example, RuntimeError.new)
+          reporter.dump
+        end
 
-      it "should tell formatter example is pending" do
-        @formatter.should_receive(:example_pending).with(description("behaviour"), "example", "reason")
-        @formatter.should_receive(:add_behaviour).with(description("behaviour"))
-        @reporter.add_behaviour(description('behaviour'))
-        @reporter.example_finished("example", Spec::DSL::ExamplePendingError.new("reason"), nil, false)
       end
 
-      it "should account for pending example in stats" do
-        @formatter.should_receive(:example_pending).with(description("behaviour"), "example", "reason")
-        @formatter.should_receive(:start_dump)
-        @formatter.should_receive(:dump_summary).with(anything(), 1, 0, 1)
-        @formatter.should_receive(:close).with(no_args)
-        @formatter.should_receive(:add_behaviour).with(description("behaviour"))
-        @reporter.add_behaviour(description('behaviour'))
-        @reporter.example_finished("example", Spec::DSL::ExamplePendingError.new("reason"), nil, false)
-        @reporter.dump
-      end
-    end
+      describe Reporter, "reporting one pending example (ExamplePendingError)" do
+        it "should tell formatter example is pending" do
+          example = ExampleGroup.new("example")
+          formatter.should_receive(:example_pending).with(example_group.description, example, "reason")
+          formatter.should_receive(:add_example_group).with(example_group)
+          reporter.add_example_group(example_group)
+          reporter.example_finished(example, Spec::Example::ExamplePendingError.new("reason"))
+        end
 
-    describe Reporter, "reporting one pending example (PendingFixedError)" do
-      include ReporterSpecHelper
-      before(:each) {setup}
+        it "should account for pending example in stats" do
+          example = ExampleGroup.new("example")
+          formatter.should_receive(:example_pending).with(example_group.description, example, "reason")
+          formatter.should_receive(:start_dump)
+          formatter.should_receive(:dump_pending)
+          formatter.should_receive(:dump_summary).with(anything(), 1, 0, 1)
+          formatter.should_receive(:close).with(no_args)
+          formatter.should_receive(:add_example_group).with(example_group)
+          reporter.add_example_group(example_group)
+          reporter.example_finished(example, Spec::Example::ExamplePendingError.new("reason"))
+          reporter.dump
+        end
+      end
 
-      it "should tell formatter pending example is fixed" do
-        @formatter.should_receive(:example_failed) do |name, counter, failure|
-          failure.header.should == "'behaviour example' FIXED"
+      describe Reporter, "reporting one pending example (PendingExampleFixedError)" do
+        it "should tell formatter pending example is fixed" do
+          formatter.should_receive(:example_failed) do |name, counter, failure|
+            failure.header.should == "'example_group example' FIXED"
+          end
+          formatter.should_receive(:add_example_group).with(example_group)
+          reporter.add_example_group(example_group)
+          reporter.example_finished(ExampleGroup.new("example"), Spec::Example::PendingExampleFixedError.new("reason"))
         end
-        @formatter.should_receive(:add_behaviour).with(description("behaviour"))
-        @reporter.add_behaviour(description('behaviour'))
-        @reporter.example_finished("example", Spec::DSL::PendingFixedError.new("reason"), nil, false)
       end
     end
   end

data/spec/spec/runner/spec_parser_spec.rb

@@ -37,6 +37,21 @@ describe SpecParserSubject, "described" do
   
 end
 
+describe SpecParserSubject, "described", :something => :something_else do
+   
+   it "7" do
+   end
+
+end
+
+describe "described", :something => :something_else do
+  
+  it "8" do
+  end
+  
+end
+   
+
 describe "SpecParser" do
   before(:each) do
     @p = Spec::Runner::SpecParser.new
@@ -89,5 +104,21 @@ describe "SpecParser" do
   it "should find context and description and example for type" do
     @p.spec_name_for(File.open(__FILE__), 36).should == "SpecParserSubject described 6"
   end
+
+  it "should find context and description for type with modifications" do
+    @p.spec_name_for(File.open(__FILE__), 40).should == "SpecParserSubject described"
+  end
+  
+  it "should find context and described and example for type with modifications" do
+    @p.spec_name_for(File.open(__FILE__), 43).should == "SpecParserSubject described 7"
+  end
+  
+  it "should find example group" do
+    @p.spec_name_for(File.open(__FILE__), 47).should == "described"
+  end
+  
+  it "should find example" do
+    @p.spec_name_for(File.open(__FILE__), 50).should == "described 8"
+  end
   
 end