rspec 1.1.4 → 1.1.5

data/spec/spec/adapters/ruby_engine_spec.rb

@@ -0,0 +1,16 @@
+describe Spec::Adapters::RubyEngine do
+  it "should default to MRI" do
+    Spec::Adapters::RubyEngine.adapter.should be_an_instance_of(Spec::Adapters::RubyEngine::MRI)
+  end
+  
+  it "should provide Rubinius for rbx" do
+    Spec::Adapters::RubyEngine.stub!(:engine).and_return('rbx')
+    Spec::Adapters::RubyEngine.adapter.should be_an_instance_of(Spec::Adapters::RubyEngine::Rubinius)
+  end
+  
+  it "should try to find whatever is defined by the RUBY_ENGINE const" do
+    Object.stub!(:const_defined?).with('RUBY_ENGINE').and_return(true)
+    Object.stub!(:const_get).with('RUBY_ENGINE').and_return("xyz")
+    Spec::Adapters::RubyEngine.engine.should == "xyz"
+  end
+end

data/spec/spec/example/base_formatter_spec.rb

@@ -0,0 +1,112 @@
+require File.dirname(__FILE__) + "/../../spec_helper"
+
+module Spec
+  module Runner
+    module Formatter
+      describe BaseFormatter do
+        before :each do
+          @options, @where = nil, nil
+          @formatter = BaseFormatter.new(@options, @where)
+        end
+        
+        class HaveInterfaceMatcher
+          def initialize(method)
+            @method = method
+          end
+          
+          attr_reader :object
+          attr_reader :method
+          
+          def matches?(object)
+            @object = object
+            object.respond_to?(@method)
+          end
+          
+          def with(arity)
+            WithArity.new(self, @method, arity)
+          end
+          
+          class WithArity
+            def initialize(matcher, method, arity)
+              @have_matcher = matcher
+              @method = method
+              @arity  = arity
+            end
+            
+            def matches?(an_object)
+              @have_matcher.matches?(an_object) && real_arity == @arity
+            end
+            
+            def failure_message
+              "#{@have_matcher} should have method :#{@method} with #{argument_arity}, but it had #{real_arity}"
+            end
+            
+            def arguments
+              self
+            end
+            
+            alias_method :argument, :arguments
+            
+          private
+            
+            def real_arity
+              @have_matcher.object.method(@method).arity
+            end
+            
+            def argument_arity
+              if @arity == 1
+                "1 argument"
+              else
+                "#{@arity} arguments"
+              end
+            end
+          end
+        end
+        
+        def have_interface_for(method)
+          HaveInterfaceMatcher.new(method)
+        end
+        
+        it "should have start as an interface with one argument"do
+          @formatter.should have_interface_for(:start).with(1).argument
+        end
+        
+        it "should have add_example_group as an interface with one argument" do
+          @formatter.should have_interface_for(:add_example_group).with(1).argument
+        end
+        
+        it "should have example_started as an interface with one argument" do
+          @formatter.should have_interface_for(:example_started).with(1).argument
+        end
+        
+        it "should have example_failed as an interface with three arguments" do
+          @formatter.should have_interface_for(:example_failed).with(3).arguments
+        end
+        
+        it "should have example_pending as an interface with three arguments" do
+          @formatter.should have_interface_for(:example_pending).with(3).arguments
+        end
+        
+        it "should have start_dump as an interface with zero arguments" do
+          @formatter.should have_interface_for(:start_dump).with(0).arguments
+        end
+        
+        it "should have dump_failure as an interface with two arguments" do
+          @formatter.should have_interface_for(:dump_failure).with(2).arguments
+        end
+        
+        it "should have dump_summary as an interface with two arguments" do
+          @formatter.should have_interface_for(:dump_failure).with(2).arguments
+        end
+
+        it "should have dump_pending as an interface with zero arguments" do
+          @formatter.should have_interface_for(:dump_pending).with(0).arguments
+        end
+
+        it "should have close  as an interface with zero arguments" do
+          @formatter.should have_interface_for(:close).with(0).arguments
+        end
+      end
+    end
+  end
+end

data/spec/spec/example/example_group_factory_spec.rb

@@ -125,14 +125,14 @@ module Spec
         it "should register ExampleGroup by default" do
           example_group = Spec::Example::ExampleGroupFactory.create_example_group("The ExampleGroup") do
           end
-          rspec_options.example_groups.should include(example_group)
+          Spec::Runner.options.example_groups.should include(example_group)
         end
 
         it "should enable unregistering of ExampleGroups" do
           example_group = Spec::Example::ExampleGroupFactory.create_example_group("The ExampleGroup") do
             unregister
           end
-          rspec_options.example_groups.should_not include(example_group)
+          Spec::Runner.options.example_groups.should_not include(example_group)
         end
 
         after(:each) do

data/spec/spec/example/example_group_methods_spec.rb

@@ -3,10 +3,12 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 module Spec
   module Example
     describe 'ExampleGroupMethods' do
-      it_should_behave_like "sandboxed rspec_options"
+      include SandboxedOptions
       attr_reader :example_group, :result, :reporter
       before(:each) do
-        options.formatters << mock("formatter", :null_object => true)
+        # See http://rspec.lighthouseapp.com/projects/5645-rspec/tickets/525-arity-changed-on-partial-mocks#ticket-525-2
+        method_with_three_args = lambda { |arg1, arg2, arg3| }
+        options.formatters << mock("formatter", :null_object => true, :example_pending => method_with_three_args)
         options.backtrace_tweaker = mock("backtrace_tweaker", :null_object => true)
         @reporter = FakeReporter.new(@options)
         options.reporter = reporter
@@ -128,8 +130,11 @@ module Spec
             def testify
               raise "This is not a real test"
             end
+            def should_something
+              # forces the run
+            end
           end
-          example_group.examples.length.should == 0
+          example_group.examples.length.should == 1
           example_group.run.should be_true
         end
 
@@ -518,6 +523,52 @@ module Spec
           example_group.registration_backtrace.join("\n").should include("#{__FILE__}:#{__LINE__-1}")
         end
       end
+      
+      describe "#run" do
+        it "should add_example_group if there are any examples to run" do
+          example_group = Class.new(ExampleGroup) do
+            it "should do something" do end
+          end
+          reporter.should_receive(:add_example_group)
+          example_group.run
+        end
+
+        it "should NOT add_example_group if there are no examples to run" do
+          example_group = Class.new(ExampleGroup) do end
+          reporter.should_not_receive(:add_example_group)
+          example_group.run
+        end
+      end
+
+      describe "#matcher_class=" do 
+        it "should call new and matches? on the class used for matching examples" do 
+          example_group = Class.new(ExampleGroup) do
+            it "should do something" do end
+            class << self
+              def specified_examples
+                ["something"]
+              end
+              def to_s
+                "TestMatcher"
+              end
+            end
+          end
+
+          matcher = mock("matcher")
+          matcher.should_receive(:matches?).with(["something"]).any_number_of_times
+          
+          matcher_class = Class.new
+          matcher_class.should_receive(:new).with("TestMatcher", "should do something").twice.and_return(matcher)
+
+          begin 
+            ExampleGroupMethods.matcher_class = matcher_class
+
+            example_group.run
+          ensure 
+            ExampleGroupMethods.matcher_class = ExampleMatcher
+          end
+        end
+      end
     end
   end
-end
+end

data/spec/spec/example/example_group_spec.rb

@@ -65,10 +65,11 @@ module Spec
     end
 
     describe ExampleGroup, "#run" do
-      it_should_behave_like "sandboxed rspec_options"
+      include SandboxedOptions
       attr_reader :example_group, :formatter, :reporter
       before :each do
-        @formatter = mock("formatter", :null_object => true)
+        method_with_three_args = lambda { |arg1, arg2, arg3| }
+        @formatter = mock("formatter", :null_object => true, :example_pending => method_with_three_args)
         options.formatters << formatter
         options.backtrace_tweaker = mock("backtrace_tweaker", :null_object => true)
         @reporter = FakeReporter.new(options)
@@ -233,7 +234,7 @@ module Spec
             options.examples = ["should be run"]
           end
 
-          it "should run only the example, when there in only one" do
+          it "should run only the example, when there is only one" do
             example_group.run
             examples_that_were_run.should == ["should be run"]
           end

data/spec/spec/example/example_methods_spec.rb

@@ -23,9 +23,9 @@ module Spec
 
       describe "lifecycle" do
         before do
-          @original_rspec_options = $rspec_options
+          @original_rspec_options = Spec::Runner.options
           @options = ::Spec::Runner::Options.new(StringIO.new, StringIO.new)
-          $rspec_options = @options
+          Spec::Runner.use @options
           @options.formatters << mock("formatter", :null_object => true)
           @options.backtrace_tweaker = mock("backtrace_tweaker", :null_object => true)
           @reporter = FakeReporter.new(@options)
@@ -43,7 +43,7 @@ module Spec
         end
 
         after do
-          $rspec_options = @original_rspec_options
+          Spec::Runner.use @original_rspec_options
           ExampleMethods.instance_variable_set("@before_all_parts", [])
           ExampleMethods.instance_variable_set("@before_each_parts", [])
           ExampleMethods.instance_variable_set("@after_each_parts", [])
@@ -83,19 +83,23 @@ module Spec
           ExampleMethods.count.should == 7
         end
 
-        describe "run_with_description_capturing" do
-          before(:each) do
-            @example_group = Class.new(ExampleGroup) do end
-            @example = @example_group.new("foo", &(lambda { 2.should == 2 }))
-            @example.run_with_description_capturing
-          end
-
-          it "should provide the generated description" do
-            @example.instance_eval { @_matcher_description }.should == "should == 2"
+        describe "eval_block" do
+          describe "with a given description" do
+            it "should provide the given description" do
+              @example_group = Class.new(ExampleGroup) do end
+              @example = @example_group.it("given description") { 2.should == 2 }
+              @example.eval_block
+              @example.description.should == "given description"
+            end
           end
 
-          it "should clear the global generated_description" do
-            Spec::Matchers.generated_description.should == nil
+          describe "with no given description" do
+            it "should provide the generated description" do
+              @example_group = Class.new(ExampleGroup) do end
+              @example = @example_group.it { 2.should == 2 }
+              @example.eval_block
+              @example.description.should == "should == 2"
+            end
           end
         end
       end

data/spec/spec/example/pending_module_spec.rb

@@ -18,6 +18,17 @@ module Spec
         }.should raise_error(ExamplePendingError, /TODO/)
       end
       
+      it 'should raise an ExamplePendingError if a supplied block fails as expected with a mock' do
+        lambda {
+          include Pending
+          pending "TODO" do
+            m = mock('thing')
+            m.should_receive(:foo)
+            m.rspec_verify
+          end
+        }.should raise_error(ExamplePendingError, /TODO/)
+      end
+      
       it 'should raise a PendingExampleFixedError if a supplied block starts working' do
         lambda {
           include Pending
@@ -27,5 +38,32 @@ module Spec
         }.should raise_error(PendingExampleFixedError, /TODO/)
       end
     end
+    
+    describe ExamplePendingError do
+      it "should have the caller (from two calls from initialization)" do
+        two_calls_ago = caller[0]
+        ExamplePendingError.new("a message").pending_caller.should == two_calls_ago
+      end
+      
+      it "should keep the trace information from initialization" do
+        two_calls_ago = caller[0]
+        obj = ExamplePendingError.new("a message")
+        obj.pending_caller
+        def another_caller(obj)
+          obj.pending_caller
+        end
+        
+        another_caller(obj).should == two_calls_ago
+      end
+      
+      it "should have the message provided" do
+        ExamplePendingError.new("a message").message.should == "a message"
+      end
+
+      it "should use a 'ExamplePendingError' as it's default message" do
+        ExamplePendingError.new.message.should == "Spec::Example::ExamplePendingError"
+      end
+    end
+    
   end
 end

data/spec/spec/example/shared_example_group_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 module Spec
   module Example
     describe ExampleGroup, "with :shared => true" do
-      it_should_behave_like "sandboxed rspec_options"
+      include SandboxedOptions
       attr_reader :formatter, :example_group
       before(:each) do
         @formatter = Spec::Mocks::Mock.new("formatter", :null_object => true)

data/spec/spec/expectations/extensions/object_spec.rb

@@ -39,12 +39,6 @@ describe Object, "#should" do
     }.should raise_error(Spec::Expectations::InvalidMatcherError)
   end
   
-  it "should raise error if it receives nil" do
-    lambda {
-      @target.should nil
-    }.should raise_error(Spec::Expectations::InvalidMatcherError)
-  end
-
   it "should raise error if it receives no argument and it is not used as a left side of an operator" do
     pending "Is it even possible to catch this?"
     lambda {
@@ -92,12 +86,6 @@ describe Object, "#should_not" do
     }.should raise_error(Spec::Expectations::InvalidMatcherError)
   end
 
-  it "should raise error if it receives nil" do
-    lambda {
-      @target.should_not nil
-    }.should raise_error(Spec::Expectations::InvalidMatcherError)
-  end
-
   it "should raise error if it receives no argument and it is not used as a left side of an operator" do
     pending "Is it even possible to catch this?"
     lambda {

data/spec/spec/extensions/main_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 module Spec
   module Extensions
     describe Main do
-      it_should_behave_like "sandboxed rspec_options"
+      include SandboxedOptions
       before(:each) do
         @main = Class.new do; include Main; end
       end
@@ -12,11 +12,6 @@ module Spec
         $rspec_story_steps = @original_rspec_story_steps
       end
 
-      it "should create an Options object" do
-        @main.send(:rspec_options).should be_instance_of(Spec::Runner::Options)
-        @main.send(:rspec_options).should === $rspec_options
-      end
-  
       specify {@main.should respond_to(:describe)}
       specify {@main.should respond_to(:context)}
 
@@ -30,7 +25,7 @@ module Spec
 
       it "should registered ExampleGroups by default" do
         example_group = @main.describe("The ExampleGroup") do end
-        rspec_options.example_groups.should include(example_group)
+        Spec::Runner.options.example_groups.should include(example_group)
       end
 
       it "should not run unregistered ExampleGroups" do
@@ -38,7 +33,7 @@ module Spec
           unregister
         end
 
-        rspec_options.example_groups.should_not include(example_group)
+        Spec::Runner.options.example_groups.should_not include(example_group)
       end
       
       it "should create a shared ExampleGroup with share_examples_for" do

data/spec/spec/matchers/change_spec.rb

@@ -55,10 +55,9 @@ describe "should change { block }" do
     end.should fail_with("result should have changed, but is still 5")
   end
   
-  it "should warn if passed a block using do/end" do
+  it "should warn if passed a block using do/end instead of {}" do
     lambda do
-      lambda {}.should change do
-      end
+      lambda {}.should change do; end
     end.should raise_error(Spec::Matchers::MatcherError, /block passed to should or should_not/)
   end
 end
@@ -79,10 +78,9 @@ describe "should_not change { block }" do
     end.should fail_with("result should not have changed, but did change from 5 to 6")
   end
   
-  it "should warn if passed a block using do/end" do
+  it "should warn if passed a block using do/end instead of {}" do
     lambda do
-      lambda {}.should_not change do
-      end
+      lambda {}.should_not change do; end
     end.should raise_error(Spec::Matchers::MatcherError, /block passed to should or should_not/)
   end
 end
@@ -317,3 +315,15 @@ describe "should change{ block }.from(old).to(new)" do
     lambda { @instance.some_value = "cat" }.should change{@instance.some_value}.from("string").to("cat")
   end
 end
+
+describe Spec::Matchers::Change do
+  it "should work when the receiver has implemented #send" do
+    @instance = SomethingExpected.new
+    @instance.some_value = "string"
+    def @instance.send(*args); raise "DOH! Library developers shouldn't use #send!" end
+    
+    lambda {
+      lambda { @instance.some_value = "cat" }.should change(@instance, :some_value)
+    }.should_not raise_error
+  end
+end