rspec 1.0.0 → 1.3.1

data/spec/spec/runner/output_one_time_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+require 'ruby_forker'
+
+module Spec
+  module Runner
+    describe CommandLine do
+      include RubyForker
+      it "should not output twice" do
+        output = ruby "-Ilib bin/spec spec/spec/runner/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

data/spec/spec/runner/quiet_backtrace_tweaker_spec.rb

@@ -1,56 +1,123 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Runner
-    describe "QuietBacktraceTweaker" do
+    describe QuietBacktraceTweaker do
       before(:each) do
         @error = RuntimeError.new
         @tweaker = QuietBacktraceTweaker.new
       end
 
-      it "should not barf on nil backtrace" do
-        lambda do
-          @tweaker.tweak_backtrace(@error, "spec name")
-        end.should_not raise_error
+      it "gracefully handles nil backtrace" do
+        expect do
+          @tweaker.tweak_backtrace(@error)
+        end.to_not raise_error
       end
 
-      it "should remove anything from textmate ruby bundle" do
+      it "gracefully handles backtraces with newlines" do
+        @error.set_backtrace(["we like\nbin/spec:\nnewlines"])
+        @tweaker.tweak_backtrace(@error)
+        @error.backtrace.should include("we like\nnewlines")
+      end
+
+      it "cleans up double slashes" do
+        @error.set_backtrace(["/a//b/c//d.rb"])
+        @tweaker.tweak_backtrace(@error)
+        @error.backtrace.should include("/a/b/c/d.rb")
+      end
+
+      it "preserves lines 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
 
-      it "should remove anything in lib spec dir" do
+      it "removes lines in lib/spec" do
         ["expectations", "mocks", "runner"].each do |child|
           element="/lib/spec/#{child}/anything.rb"
           @error.set_backtrace([element])
-          @tweaker.tweak_backtrace(@error, "spec name")
-          unless (@error.backtrace.empty?)
-            raise("Should have tweaked away '#{element}'")
-          end
+          @tweaker.tweak_backtrace(@error)
+          @error.backtrace.should be_empty, "Should have removed line with '#{element}'"
         end
       end
 
-      it "should remove mock_frameworks/rspec" do
+      it "removes lines in bin/spec" do
+        @error.set_backtrace(["bin/spec:"])
+        @tweaker.tweak_backtrace(@error)
+        @error.backtrace.should be_empty
+      end
+
+      it "preserves lines in spec" do
+        @error.set_backtrace(["spec/foo/bar_spec.rb"])
+        @tweaker.tweak_backtrace(@error)
+        @error.backtrace.should == ["spec/foo/bar_spec.rb"]
+      end
+
+      it "preserves lines in ./spec" do
+        @error.set_backtrace(["./spec/foo/bar_spec.rb"])
+        @tweaker.tweak_backtrace(@error)
+        @error.backtrace.should == ["./spec/foo/bar_spec.rb"]
+      end
+
+      it "preserves lines in /path/to/project/spec" do
+        @error.set_backtrace(["/path/to/project/spec/foo/bar_spec.rb"])
+        @tweaker.tweak_backtrace(@error)
+        @error.backtrace.should == ["/path/to/project/spec/foo/bar_spec.rb"]
+      end
+
+      it "removes lines in mock_frameworks/rspec" do
+        element = "mock_frameworks/rspec"
+        @error.set_backtrace([element])
+        @tweaker.tweak_backtrace(@error)
+        @error.backtrace.should be_empty, "Should have removed line with '#{element}'"
+      end
+
+      it "removes custom patterns in regexp form" do
+        element = "/vendor/lib/custom_pattern/"
+        @tweaker.ignore_patterns /custom_pattern/
+        @error.set_backtrace([element])
+        @tweaker.tweak_backtrace(@error)
+        @error.backtrace.should be_empty, "Should have removed line with '#{element}'"
+      end
+
+      it "removes custom patterns in string form" do
+        element = "/vendor/lib/custom_pattern/"
+        @tweaker.ignore_patterns "custom_pattern"
+        @error.set_backtrace([element])
+        @tweaker.tweak_backtrace(@error)
+        @error.backtrace.should be_empty, "Should have removed line with '#{element}'"
+      end
+
+      it "removes lines in mock_frameworks/rspec" do
         element = "mock_frameworks/rspec"
         @error.set_backtrace([element])
-        @tweaker.tweak_backtrace(@error, "spec name")
-        unless (@error.backtrace.empty?)
-          raise("Should have tweaked away '#{element}'")
+        @tweaker.tweak_backtrace(@error)
+        @error.backtrace.should be_empty, "Should have removed line with '#{element}'"
+      end
+
+      it "removes lines in rspec gem" do
+        ["/rspec-1.2.3/lib/spec.rb","/rspec-1.2.3/lib/spec/anything.rb","bin/spec:123"].each do |element|
+          @error.set_backtrace([element])
+          @tweaker.tweak_backtrace(@error)
+          @error.backtrace.should be_empty, "Should have removed line with '#{element}'"
         end
       end
 
-      it "should remove bin spec" do
-        @error.set_backtrace(["bin/spec:"])
-        @tweaker.tweak_backtrace(@error, "spec name")
-        @error.backtrace.should be_empty
+      it "removes lines in pre-release rspec gems" do
+        ["/rspec-1.2.3.a1.gem/lib/spec.rb","/rspec-1.2.3.b1.gem/lib/spec.rb","/rspec-1.2.3.rc1.gem/lib/spec.rb"].each do |element|
+          @error.set_backtrace([element])
+          @tweaker.tweak_backtrace(@error)
+          @error.backtrace.should be_empty, "Should have removed line with '#{element}'"
+        end
       end
-      
-      it "should clean up double slashes" do
-        @error.set_backtrace(["/a//b/c//d.rb"])
-        @tweaker.tweak_backtrace(@error, "spec name")
-        @error.backtrace.should include("/a/b/c/d.rb")
+
+      it "removes lines in spork gem" do
+        ["/spork-1.2.3/lib/spec.rb","/spork-1.2.3/lib/spec/anything.rb","bin/spork:123"].each do |element|
+          @error.set_backtrace([element])
+          @tweaker.tweak_backtrace(@error)
+          @error.backtrace.should be_empty, "Should have removed line with '#{element}'"
+        end
       end
     end
   end
-end
+end

data/spec/spec/runner/reporter_spec.rb

@@ -1,153 +1,244 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 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, :example_group_proxy, :example_proxy
+      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")
+        @example_group_proxy = Spec::Example::ExampleGroupProxy.new(@example_group)
+        @example_proxy = Spec::Example::ExampleProxy.new
+        example_group.notify(reporter)
       end
 
       def failure
-        Mocks::DuckTypeArgConstraint.new(:header, :exception)
+        Mocks::ArgumentMatchers::DuckTypeMatcher.new(:header, :exception)
       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("behaviour")
-        @reporter.add_behaviour("behaviour")
+
+      def create_example_group(text)
+        example_group = Spec::Example::ExampleGroup.describe(text) do
+          it "should do something" do
+          end
+        end
+        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(:dump_summary).with(:anything, 3, 0, 0)
-        @reporter.add_behaviour("behaviour")
-        @reporter.example_started("spec 1")
-        @reporter.example_finished("spec 1")
-        @reporter.add_behaviour("behaviour")
-        @reporter.example_started("spec 2")
-        @reporter.example_finished("spec 2")
-        @reporter.add_behaviour("behaviour")
-        @reporter.example_started("spec 3")
-        @reporter.example_finished("spec 3")
-        @reporter.dump
+      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(:example_group_started).with(example_group_proxy)
+        example_group.notify(reporter)
+      end
+      
+      it "should handle multiple example_groups with same name" do
+        formatter.should_receive(:example_group_started).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)
+        create_example_group("example_group").notify(reporter)
+        reporter.example_started(description_of("spec 1"))
+        reporter.example_finished(description_of("spec 1"))
+        create_example_group("example_group").notify(reporter)
+        reporter.example_started(description_of("spec 2"))
+        reporter.example_finished(description_of("spec 2"))
+        create_example_group("example_group").notify(reporter)
+        reporter.example_started(description_of("spec 3"))
+        reporter.example_finished(description_of("spec 3"))
+        reporter.dump
+      end
+      
+      def description_of(example)
+        ::Spec::Example::ExampleProxy.new(String === example ? example : example.description)
       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(:dump_summary).with(:anything, 4, 2, 0)
-        @backtrace_tweaker.should_receive(:tweak_backtrace).twice
-        @reporter.add_behaviour("behaviour")
-        @reporter.example_finished("example")
-        @reporter.example_finished("example", error)
-        @reporter.add_behaviour("behaviour")
-        @reporter.example_finished("example")
-        @reporter.example_finished("example", error)
-        @reporter.dump
+        passing = ::Spec::Example::ExampleGroupDouble.new(example_proxy)
+        failing = ::Spec::Example::ExampleGroupDouble.new(example_proxy)
+
+        formatter.should_receive(:example_group_started).exactly(2).times
+        formatter.should_receive(:example_passed).with(description_of(passing)).exactly(2).times
+        formatter.should_receive(:example_failed).with(description_of(failing), 1, failure)
+        formatter.should_receive(:example_failed).with(description_of(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
+
+        create_example_group("example_group").notify(reporter)
+        reporter.example_finished(description_of(passing))
+        reporter.example_finished(description_of(failing), error)
+
+        create_example_group("example_group").notify(reporter)
+        reporter.example_finished(description_of(passing))
+        reporter.example_finished(description_of(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)
-        @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(: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")
+        reporter.start(5)
+        reporter.end
+        reporter.dump
       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")
-      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)
-        @reporter.example_finished("example")
-        @reporter.dump
-      end
-    end
-
-    describe Reporter, " reporting one failing example" do
-      include ReporterSpecHelper
-      before(:each) {setup}
-
-      it "should tell formatter that example failed" do
-        @formatter.should_receive(:example_failed)
-        @reporter.example_finished("example", RuntimeError.new)
-      end
+      describe "reporting one passing example" do
+        it "should tell formatter example passed" do
+          formatter.should_receive(:example_passed)
+          reporter.example_finished(description_of("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(description_of("example"))
+        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(description_of("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)
-        @reporter.add_behaviour("behaviour")
-        @reporter.example_finished("example", RuntimeError.new)
-        @reporter.dump
+      
+      describe "reporting one failing example" do
+        it "should tell formatter that example failed" do
+          example = example_group.it("should do something") {}
+          formatter.should_receive(:example_failed)
+          reporter.example_finished(description_of(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(example_proxy, RuntimeError.new)
+        end
+      
+        it "should account for failing example in stats" do
+          example = ::Spec::Example::ExampleGroupDouble.new(example_proxy)
+          formatter.should_receive(:example_failed).with(description_of(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(description_of(example), RuntimeError.new)
+          reporter.dump
+        end
+      
       end
       
-    end
-    
-    describe Reporter, " reporting one not implemented example" do
-      include ReporterSpecHelper
-      before(:each) {setup}
-
-      it "should tell formatter example passed" do
-        @formatter.should_receive(:example_not_implemented)
-        @reporter.example_finished("example", nil, nil, true)
+      describe "reporting one pending example (ExamplePendingError)" do
+        before :each do
+          @pending_error = Spec::Example::ExamplePendingError.new("reason")
+        end
+        
+        it "should tell formatter example is pending" do
+          example = ExampleGroup.new(example_proxy)
+          formatter.should_receive(:example_pending).with(description_of(example), "reason")
+          formatter.should_receive(:example_group_started).with(example_group_proxy)
+          example_group.notify(reporter)
+          reporter.example_finished(description_of(example), @pending_error)
+        end
+      
+        it "should account for pending example in stats" do
+          example = ExampleGroup.new(example_proxy)
+          formatter.should_receive(:example_pending).with(description_of(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(:example_group_started).with(example_group_proxy)
+          example_group.notify(reporter)
+          reporter.example_finished(description_of(example), @pending_error)
+          reporter.dump
+        end
+        
+        describe "to formatters which have example_pending's arity of 3 (which is now deprecated)" do
+          before :each do
+            Spec.stub!(:warn)
+          
+            @deprecated_formatter = Class.new(@formatter.class) do
+              attr_reader :example_passed_to_method, :message_passed_to_method
+      
+              def example_pending(example_passed_to_method, message_passed_to_method, deprecated_pending_location)
+                @example_passed_to_method = example_passed_to_method
+                @message_passed_to_method = message_passed_to_method
+              end
+            end.new(options, formatter_output)
+            
+            options.formatters << @deprecated_formatter
+          end
+          
+          it "should pass the correct example description to the formatter" do
+            proxy = Spec::Example::ExampleProxy.new("name")
+            example = ExampleGroup.new(proxy)
+            example_group.notify(reporter)
+            reporter.example_finished(description_of(example), @pending_error)
+            
+            @deprecated_formatter.example_passed_to_method.should == proxy
+          end
+          
+          it "should pass the correct pending error message to the formatter" do
+            example = ExampleGroup.new(example_proxy)
+            example_group.notify(reporter)
+            reporter.example_finished(description_of(example), @pending_error)
+            
+            @deprecated_formatter.message_passed_to_method.should ==  @pending_error.message
+          end
+          
+          it "should raise a deprecation warning" do
+            Spec.should_receive(:warn)
+            
+            example = ExampleGroup.new(example_proxy)
+            example_group.notify(reporter)
+            reporter.example_finished(description_of(example), @pending_error)
+          end
+        end
       end
-
-      it "should account for not implemented example in stats" do
-        @formatter.should_receive(:example_not_implemented)
-        @formatter.should_receive(:start_dump)
-        @formatter.should_receive(:dump_summary).with(:anything, 1, 0, 1)
-        @reporter.example_finished("example", nil, nil, true)
-        @reporter.dump
+      
+      describe "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 should do something' FIXED"
+          end
+          formatter.should_receive(:example_group_started).with(example_group_proxy)
+          example_group.notify(reporter)
+          reporter.example_finished(description_of(example_group.examples.first), Spec::Example::PendingExampleFixedError.new("reason"))
+        end
       end
     end
   end
-end
+end

data/spec/spec/runner/resources/a_spec.rb

@@ -0,0 +1 @@
+# Empty - used by ../options_spec.rb

data/spec/spec/runner/resources/custom_example_group_runner.rb

@@ -0,0 +1,14 @@
+module Custom
+  class ExampleGroupRunner
+    attr_reader :options, :arg
+    def initialize(options, arg)
+      @options, @arg = options, arg
+    end
+
+    def load_files(files)
+    end
+
+    def run
+    end
+  end  
+end

data/spec/spec/runner/resources/utf8_encoded.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+module Custom
+  class ExampleUTF8ClassNameVarietà
+    def self.è
+      così = :però
+    end
+  end
+end

data/spec/spec/runner/spec.opts

@@ -0,0 +1,2 @@
+--diff
+--colour

data/spec/spec/runner/spec_drb.opts

@@ -0,0 +1,2 @@
+--colour
+--drb

data/spec/spec/runner/spec_spaced.opts

@@ -0,0 +1,2 @@
+--diff --colour
+--format s

data/spec/spec/runner_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+module Spec
+  describe Runner do
+    describe ".configure" do
+      it "should yield global configuration" do
+        Spec::Runner.configure do |config|
+          config.should equal(Spec::Runner.configuration)
+        end
+      end
+    end
+  end
+end

data/spec/spec.opts

@@ -0,0 +1,6 @@
+--colour
+--format
+profile
+--timeout
+20
+--diff