rspec 1.0.5 → 1.0.6

data/spec/spec/runner/options_spec.rb

@@ -2,11 +2,11 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Runner
-    describe "Options" do
+    describe Options do
       before do
-        @error_stream = StringIO.new('')
-        @out_stream = StringIO.new('')
-        @options = Options.new
+        @err = StringIO.new('')
+        @out = StringIO.new('')
+        @options = Options.new(@err, @out)
       end
 
       it "instantiates empty arrays" do
@@ -23,36 +23,42 @@ module Spec
       end
 
       it "parse_diff sets context_lines" do
-        @options.parse_diff nil, @out_stream, @error_stream
+        @options.parse_diff nil
         @options.context_lines.should == 3
       end
 
       it "defaults diff to unified" do
-        @options.parse_diff nil, @out_stream, @error_stream
+        @options.parse_diff nil
         @options.diff_format.should == :unified
       end
 
       it "should use unified diff format option when format is unified" do
-        @options.parse_diff 'unified', @out_stream, @error_stream
+        @options.parse_diff 'unified'
         @options.diff_format.should == :unified
         @options.differ_class.should equal(Spec::Expectations::Differs::Default)
       end
 
       it "should use context diff format option when format is context" do
-        @options.parse_diff 'context', @out_stream, @error_stream
+        @options.parse_diff 'context'
         @options.diff_format.should == :context
         @options.differ_class.should == Spec::Expectations::Differs::Default
       end
 
       it "should use custom diff format option when format is a custom format" do
-        @options.parse_diff "Custom::Formatter", @out_stream, @error_stream
+        @options.parse_diff "Custom::Formatter"
         @options.diff_format.should == :custom
         @options.differ_class.should == Custom::Formatter
       end
 
-      it "should print instructions about how to fix bad differ" do
-        @options.parse_diff "Custom::BadFormatter", @out_stream, @error_stream
-        @error_stream.string.should match(/Couldn't find differ class Custom::BadFormatter/n)
+      it "should print instructions about how to fix missing differ" do
+        lambda { @options.parse_diff "Custom::MissingDiffer" }.should raise_error(NameError)
+        @err.string.should match(/Couldn't find differ class Custom::MissingDiffer/n)
+      end      
+
+      it "should print instructions about how to fix bad formatter" do
+        lambda do
+          @options.parse_format "Custom::BadFormatter"
+        end.should raise_error(NameError, /undefined local variable or method `bad_method'/)
       end      
 
       it "parse_example sets single example when argument not a file" do
@@ -76,9 +82,50 @@ module Spec
       end
     end
 
-    describe "Options", "receiving create_behaviour_runner" do
+    describe Options, "splitting class names and args" do
+      before do
+        @err = StringIO.new('')
+        @out = StringIO.new('')
+        @options = Options.new(@err, @out)
+      end
+      
+      it "should split class names with args" do
+        @options.split_at_colon('Foo').should == ['Foo', nil]
+        @options.split_at_colon('Foo:arg').should == ['Foo', 'arg']
+        @options.split_at_colon('Foo::Bar::Zap:arg').should == ['Foo::Bar::Zap', 'arg']
+        @options.split_at_colon('Foo:arg1,arg2').should == ['Foo', 'arg1,arg2']
+        @options.split_at_colon('Foo::Bar::Zap:arg1,arg2').should == ['Foo::Bar::Zap', 'arg1,arg2']
+        @options.split_at_colon('Foo::Bar::Zap:drb://foo,drb://bar').should == ['Foo::Bar::Zap', 'drb://foo,drb://bar']
+      end
+
+      it "should raise error when splitting something starting with a number" do
+        lambda { @options.split_at_colon('') }.should raise_error("Couldn't parse \"\"")
+      end
+
+      it "should raise error when not class name" do
+        lambda do
+          @options.load_class('foo', 'fruit', '--food')
+        end.should raise_error('"foo" is not a valid class name')
+      end
+    end
+
+    describe Options, "receiving create_behaviour_runner" do
       before do
-        @options = Options.new
+        @err = StringIO.new
+        @out = StringIO.new
+        @options = Options.new(@err, @out)
+      end
+
+      it "should fail when custom runner not found" do
+        @options.runner_arg = "Whatever"
+        lambda { @options.create_behaviour_runner }.should raise_error(NameError)
+        @err.string.should match(/Couldn't find behaviour runner class/)
+      end
+
+      it "should fail when custom runner not valid class name" do
+        @options.runner_arg = "whatever"
+        lambda { @options.create_behaviour_runner }.should raise_error('"whatever" is not a valid class name')
+        @err.string.should match(/"whatever" is not a valid class name/)
       end
 
       it "returns nil when generate is true" do
@@ -91,20 +138,6 @@ module Spec
         runner.class.should == BehaviourRunner
       end
 
-      it "returns a custom runner when runner_type is set" do
-        runner_type = Class.new do
-          attr_reader :options
-          def initialize(options)
-            @options = options
-          end
-        end
-        @options.runner_type = runner_type
-
-        runner = @options.create_behaviour_runner
-        runner.class.should == runner_type
-        runner.options.should === @options
-      end
-
       it "does not set Expectations differ when differ_class is not set" do
         @options.differ_class = nil
         Spec::Expectations.should_not_receive(:differ=)
@@ -116,7 +149,7 @@ module Spec
         Spec::Expectations.should_receive(:differ=).with(anything()).and_return do |arg|
           arg.class.should == Spec::Expectations::Differs::Default
         end
-        @options.create_behaviour_runner
+        @options.configure
       end
 
       it "creates a Reporter" do
@@ -124,7 +157,7 @@ module Spec
         @options.formatters << formatter
         reporter = Reporter.new(@formatters, @backtrace_tweaker)
         Reporter.should_receive(:new).with(@options.formatters, @options.backtrace_tweaker).and_return(reporter)
-        @options.create_behaviour_runner
+        @options.configure
         @options.reporter.should === reporter
       end
 
@@ -135,7 +168,7 @@ module Spec
         formatter.should_receive(:colour=).with(true)
         formatter.should_receive(:dry_run=).with(true)
         @options.formatters << formatter
-        @options.create_behaviour_runner
+        @options.configure
       end
     end
   end

data/spec/spec/runner/reporter_spec.rb

@@ -14,6 +14,10 @@ module Spec
       def failure
         Mocks::DuckTypeArgConstraint.new(:header, :exception)
       end
+      
+      def description(s)
+        Spec::DSL::Description.new(s)
+      end
     end
     
     describe Reporter do
@@ -21,8 +25,8 @@ module Spec
       before(:each) {setup}
       
       it "should tell formatter when behaviour is added" do
-        @formatter.should_receive(:add_behaviour).with("behaviour")
-        @reporter.add_behaviour("behaviour")
+        @formatter.should_receive(:add_behaviour).with(description("behaviour"))
+        @reporter.add_behaviour(description("behaviour"))
       end
 
       it "should handle multiple behaviours with same name" do
@@ -30,14 +34,15 @@ module Spec
         @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("behaviour")
+        @reporter.add_behaviour(description("behaviour"))
         @reporter.example_started("spec 1")
         @reporter.example_finished("spec 1")
-        @reporter.add_behaviour("behaviour")
+        @reporter.add_behaviour(description("behaviour"))
         @reporter.example_started("spec 2")
         @reporter.example_finished("spec 2")
-        @reporter.add_behaviour("behaviour")
+        @reporter.add_behaviour(description("behaviour"))
         @reporter.example_started("spec 3")
         @reporter.example_finished("spec 3")
         @reporter.dump
@@ -51,12 +56,13 @@ module Spec
         @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("behaviour")
+        @reporter.add_behaviour(description("behaviour"))
         @reporter.example_finished("example")
         @reporter.example_finished("example", error)
-        @reporter.add_behaviour("behaviour")
+        @reporter.add_behaviour(description("behaviour"))
         @reporter.example_finished("example")
         @reporter.example_finished("example", error)
         @reporter.dump
@@ -65,12 +71,14 @@ module Spec
       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
       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|
           time.to_s.should match(/[0-9].[0-9|e|-]+/)
         end
@@ -80,7 +88,7 @@ module Spec
       end
     end
     
-    describe Reporter, " reporting one passing example" do
+    describe Reporter, "reporting one passing example" do
       include ReporterSpecHelper
       before(:each) {setup}
 
@@ -99,12 +107,13 @@ module Spec
         @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 failing example" do
+    describe Reporter, "reporting one failing example" do
       include ReporterSpecHelper
       before(:each) {setup}
 
@@ -125,29 +134,72 @@ module Spec
         @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")
+        @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 not implemented example" do
+    describe Reporter, "reporting one pending example (Not Yet Implemented)" do
       include ReporterSpecHelper
       before(:each) {setup}
 
-      it "should tell formatter example passed" do
-        @formatter.should_receive(:example_not_implemented)
+      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
 
-      it "should account for not implemented example in stats" do
-        @formatter.should_receive(:example_not_implemented)
+      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
+
+    describe Reporter, "reporting one pending example (ExamplePendingError)" do
+      include ReporterSpecHelper
+      before(:each) {setup}
+
+      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 (PendingFixedError)" do
+      include ReporterSpecHelper
+      before(:each) {setup}
+
+      it "should tell formatter pending example is fixed" do
+        @formatter.should_receive(:example_failed) do |name, counter, failure|
+          failure.header.should == "'behaviour example' FIXED"
+        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
 end

data/spec/spec/spec_classes.rb

@@ -104,8 +104,16 @@ module Custom
     end
   end
 
+  class BadFormatter < Spec::Runner::Formatter::BaseTextFormatter
+    attr_reader :where
+    
+    def initialize(where)
+      bad_method
+    end
+  end
+
   class BehaviourRunner
-    def initialize(one); end
+    def initialize(options, arg=nil); end
   end
 end
 

data/spec/spec/translator_spec.rb

@@ -213,4 +213,52 @@ describe "Translator" do
       "controller.should redirect_to('http://not_existing_domain_for_novalis.test.host/404.html')"
     )
   end
+
+  it "should translate :any_args" do
+    @t.translate_line(
+      "mock.should_receive(:foo).with(:any_args)"
+    ).should eql(
+      "mock.should_receive(:foo).with(any_args)"
+    )
+  end
+
+  it "should translate :anything" do
+    @t.translate_line(
+      "mock.should_receive(:foo).with(:anything)"
+    ).should eql(
+      "mock.should_receive(:foo).with(anything)"
+    )
+  end
+
+  it "should translate :boolean" do
+    @t.translate_line(
+      "mock.should_receive(:foo).with(:boolean)"
+    ).should eql(
+      "mock.should_receive(:foo).with(boolean)"
+    )
+  end
+
+  it "should translate :no_args" do
+    @t.translate_line(
+      "mock.should_receive(:foo).with(:no_args)"
+    ).should eql(
+      "mock.should_receive(:foo).with(no_args)"
+    )
+  end
+
+  it "should translate :numeric" do
+    @t.translate_line(
+      "mock.should_receive(:foo).with(:numeric)"
+    ).should eql(
+      "mock.should_receive(:foo).with(an_instance_of(Numeric))"
+    )
+  end
+
+  it "should translate :string" do
+    @t.translate_line(
+      "mock.should_receive(:foo).with(:string)"
+    ).should eql(
+      "mock.should_receive(:foo).with(an_instance_of(String))"
+    )
+  end
 end

data/spec/spec_helper.rb

@@ -4,10 +4,11 @@ require 'rbconfig'
 dir = File.dirname(__FILE__)
 lib_path = File.expand_path("#{dir}/../lib")
 $LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
+$_spec_spec = true # Prevents Kernel.exit in various places
 
 require 'spec'
 require 'spec/mocks'
-require 'hpricot'
+require 'hpricot' # Needed to compare generated with wanted HTML
 spec_classes_path = File.expand_path("#{dir}/../spec/spec/spec_classes")
 require spec_classes_path unless $LOAD_PATH.include?(spec_classes_path)
 
@@ -26,7 +27,7 @@ module Spec
         begin
           proc.call
           true
-        rescue => @error
+        rescue Exception => @error
           false
         end
       end
@@ -41,3 +42,5 @@ module Spec
     end
   end
 end
+
+class NonStandardError < Exception; end

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
-date: 2007-06-05 00:00:00 -05:00
-summary: RSpec-1.0.5 (r2081) - BDD for Ruby http://rspec.rubyforge.org/
+  version: 1.0.6
+date: 2007-08-12 00:00:00 -04:00
+summary: RSpec-1.0.6 (r2326) - BDD for Ruby http://rspec.rubyforge.org/
 require_paths: 
 - lib
 email: rspec-devel@rubyforge.org
@@ -27,7 +27,7 @@ signing_key:
 cert_chain: 
 post_install_message: 
 authors: 
-- - RSpec Development Team
+- RSpec Development Team
 files: 
 - CHANGES
 - EXAMPLES.rd
@@ -44,6 +44,7 @@ files:
 - lib/spec/dsl/composite_proc_builder.rb
 - lib/spec/dsl/configuration.rb
 - lib/spec/dsl/description.rb
+- lib/spec/dsl/errors.rb
 - lib/spec/dsl/example.rb
 - lib/spec/dsl/example_matcher.rb
 - lib/spec/dsl/example_should_raise_handler.rb
@@ -114,6 +115,9 @@ files:
 - lib/spec/translator.rb
 - lib/spec/version.rb
 - lib/spec.rb
+- spec/autotest/discover_spec.rb
+- spec/autotest/rspec_spec.rb
+- spec/autotest_helper.rb
 - spec/spec/dsl/behaviour_eval_spec.rb
 - spec/spec/dsl/behaviour_factory_spec.rb
 - spec/spec/dsl/behaviour_spec.rb
@@ -122,6 +126,7 @@ files:
 - spec/spec/dsl/description_spec.rb
 - spec/spec/dsl/example_class_spec.rb
 - spec/spec/dsl/example_instance_spec.rb
+- spec/spec/dsl/example_matcher_spec.rb
 - spec/spec/dsl/example_should_raise_spec.rb
 - spec/spec/dsl/predicate_matcher_spec.rb
 - spec/spec/dsl/shared_behaviour_spec.rb
@@ -152,6 +157,7 @@ files:
 - spec/spec/mocks/at_least_spec.rb
 - spec/spec/mocks/at_most_spec.rb
 - spec/spec/mocks/bug_report_10260_spec.rb
+- spec/spec/mocks/bug_report_11545_spec.rb
 - spec/spec/mocks/bug_report_7611_spec.rb
 - spec/spec/mocks/bug_report_7805_spec.rb
 - spec/spec/mocks/bug_report_8165_spec.rb
@@ -176,8 +182,8 @@ files:
 - spec/spec/runner/command_line_spec.rb
 - spec/spec/runner/context_matching_spec.rb
 - spec/spec/runner/drb_command_line_spec.rb
-- spec/spec/runner/example_matcher_spec.rb
 - spec/spec/runner/execution_context_spec.rb
+- spec/spec/runner/extensions/bug_report_10577_spec.rb
 - spec/spec/runner/extensions/kernel_spec.rb
 - spec/spec/runner/formatter/failing_behaviours_formatter_spec.rb
 - spec/spec/runner/formatter/failing_examples_formatter_spec.rb
@@ -217,8 +223,8 @@ files:
 - examples/legacy_spec.rb
 - examples/mocking_example.rb
 - examples/multi_threaded_behaviour_runner.rb
-- examples/not_yet_implemented_spec.rb
 - examples/partial_mock_example.rb
+- examples/pending_example.rb
 - examples/predicate_example.rb
 - examples/priority.txt
 - examples/shared_behaviours_example.rb
@@ -231,6 +237,7 @@ files:
 - plugins/mock_frameworks
 - plugins/mock_frameworks/flexmock.rb
 - plugins/mock_frameworks/mocha.rb
+- plugins/mock_frameworks/rr.rb
 - plugins/mock_frameworks/rspec.rb
 test_files: []