rspec 1.1.4 → 1.1.5

data/spec/spec/mocks/hash_including_matcher_spec.rb

@@ -2,31 +2,52 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Mocks
-    describe HashIncludingConstraint do
-      
-      it "should match the same hash" do
-        hash_including(:a => 1).matches?(:a => 1).should be_true
-      end
-      
-      it "should not match a non-hash" do
-        hash_including(:a => 1).matches?(1).should_not be_true
-      end
+    module ArgumentConstraints
+      describe HashIncludingConstraint do
+        
+        it "should describe itself properly" do
+          HashIncludingConstraint.new(:a => 1).description.should == "hash_including(:a=>1)"
+        end      
 
-      it "should match a hash with extra stuff" do
-        hash_including(:a => 1).matches?(:a => 1, :b => 2).should be_true
-      end
-      
-      it "should not match a hash with a missing key" do
-        hash_including(:a => 1).matches?(:b => 2).should_not be_true
-      end
+        describe "passing" do
+          it "should match the same hash" do
+            hash_including(:a => 1).should == {:a => 1}
+          end
 
-      it "should not match a hash with an incorrect value" do
-        hash_including(:a => 1, :b => 2).matches?(:a => 1, :b => 3).should_not be_true
-      end
+          it "should match a hash with extra stuff" do
+            hash_including(:a => 1).should == {:a => 1, :b => 2}
+          end
+          
+          describe "when matching against other constraints" do
+            it "should match an int against anything()" do
+              hash_including(:a => anything, :b => 2).should == {:a => 1, :b => 2}
+            end
 
-      it "should describe itself properly" do
-        HashIncludingConstraint.new(:a => 1).description.should == "hash_including(:a=>1)"
-      end      
+            it "should match a string against anything()" do
+              hash_including(:a => anything, :b => 2).should == {:a => "1", :b => 2}
+            end
+          end
+        end
+        
+        describe "failing" do
+          it "should not match a non-hash" do
+            hash_including(:a => 1).should_not == 1
+          end
+
+
+          it "should not match a hash with a missing key" do
+            hash_including(:a => 1).should_not == {:b => 2}
+          end
+
+          it "should not match a hash with an incorrect value" do
+            hash_including(:a => 1, :b => 2).should_not == {:a => 1, :b => 3}
+          end
+
+          it "should not match when values are nil but keys are different" do
+            hash_including(:a => nil).should_not == {:b => nil}
+          end
+        end
+      end
     end
- end
-end
+  end
+end

data/spec/spec/mocks/mock_spec.rb

@@ -23,6 +23,18 @@ module Spec
         end
       end
       
+      it "should report line number of expectation of unreceived message after #should_receive after similar stub" do
+        @mock.stub!(:wont_happen)
+        expected_error_line = __LINE__; @mock.should_receive(:wont_happen).with("x", 3)
+        begin
+          @mock.rspec_verify
+          violated
+        rescue MockExpectationError => e
+          # NOTE - this regexp ended w/ $, but jruby adds extra info at the end of the line
+          e.backtrace[0].should match(/#{File.basename(__FILE__)}:#{expected_error_line}/)
+        end
+      end
+      
       it "should pass when not receiving message specified as not to be received" do
         @mock.should_not_receive(:not_expected)
         @mock.rspec_verify
@@ -403,7 +415,16 @@ module Spec
         @mock.msg.should equal(:stub_value)
         @mock.rspec_verify
       end
-    
+
+      it "should not require a different signature to replace a method stub" do
+        @mock.stub!(:msg).and_return(:stub_value)
+        @mock.should_receive(:msg).and_return(:mock_value)
+        @mock.msg(:arg).should equal(:mock_value)
+        @mock.msg.should equal(:stub_value)
+        @mock.msg.should equal(:stub_value)
+        @mock.rspec_verify
+      end
+
       it "should temporarily replace a method stub on a non-mock" do
         non_mock = Object.new
         non_mock.stub!(:msg).and_return(:stub_value)
@@ -413,7 +434,22 @@ module Spec
         non_mock.msg.should equal(:stub_value)
         non_mock.rspec_verify
       end
-      
+
+      it "should return the stubbed value when no new value specified" do
+        @mock.stub!(:msg).and_return(:stub_value)
+        @mock.should_receive(:msg)
+        @mock.msg.should equal(:stub_value)
+        @mock.rspec_verify
+      end
+
+      it "should not mess with the stub's yielded values when also mocked" do
+        @mock.stub!(:yield_back).and_yield(:stub_value)
+        @mock.should_receive(:yield_back).and_yield(:mock_value)
+        @mock.yield_back{|v| v}.should == :mock_value
+        @mock.yield_back{|v| v}.should == :stub_value
+        @mock.rspec_verify
+      end
+
       it "should assign stub return values" do
         mock = Mock.new('name', :message => :response)
         mock.message.should == :response
@@ -439,6 +475,15 @@ module Spec
         @calls.should == 1
       end
     
+      it "should call the block after #should_receive after a similar stub" do
+        @mock.stub!(:foo).and_return(:bar)
+        @mock.should_receive(:foo) { add_call }
+    
+        @mock.foo
+    
+        @calls.should == 1
+      end
+    
       it "should call the block after #once" do
         @mock.should_receive(:foo).once { add_call }
     
@@ -472,14 +517,6 @@ module Spec
         @calls.should == 7
       end
     
-      it "should call the block after #with" do
-        @mock.should_receive(:foo).with(:arg) { add_call }
-        
-        @mock.foo(:arg)
-    
-        @calls.should == 1
-      end
-    
       it "should call the block after #ordered" do
         @mock.should_receive(:foo).ordered { add_call }
         @mock.should_receive(:bar).ordered { add_call }
@@ -490,5 +527,13 @@ module Spec
         @calls.should == 2
       end
     end
+    
+    describe 'string representation generated by #to_s' do
+      it 'should not contain < because that might lead to invalid HTML in some situations' do
+        mock = mock("Dog")
+        valid_html_str = "#{mock}"
+        valid_html_str.should_not include('<')
+      end
+    end
   end
 end

data/spec/spec/mocks/nil_expectation_warning_spec.rb

@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Mocks
+
+    describe "an expectation set on nil" do
+      
+      it "should issue a warning with file and line number information" do
+        expected_warning = "An expectation of :foo was set on nil. Called from #{__FILE__}:#{__LINE__+3}. Use allow_message_expectations_on_nil to disable warnings."
+        Kernel.should_receive(:warn).with(expected_warning)
+
+        nil.should_receive(:foo)
+        nil.foo
+      end
+      
+      it "should issue a warning when the expectation is negative" do
+        Kernel.should_receive(:warn)
+
+        nil.should_not_receive(:foo)
+      end
+      
+      it "should not issue a warning when expectations are set to be allowed" do
+        allow_message_expectations_on_nil
+        Kernel.should_not_receive(:warn)
+        
+        nil.should_receive(:foo)
+        nil.should_not_receive(:bar)
+        nil.foo
+      end
+
+    end
+    
+    describe "#allow_message_expectations_on_nil" do
+      include SandboxedOptions
+      
+      it "should not effect subsequent examples" do
+        example_group = Class.new(ExampleGroup)
+        example_group.it("when called in one example that doesn't end up setting an expectation on nil") do
+                        allow_message_expectations_on_nil
+                      end
+        example_group.it("should not effect the next exapmle ran") do
+                        Kernel.should_receive(:warn)
+                        nil.should_receive(:foo)
+                        nil.foo
+                      end
+                              
+        example_group.run.should be_true
+                  
+      end
+
+    end
+    
+  end
+end

data/spec/spec/mocks/null_object_mock_spec.rb

@@ -36,5 +36,19 @@ module Spec
         @mock.message(:unexpected_arg)
       end
     end
+
+    describe "#null_object?" do
+      it "should default to false" do
+        obj = mock('anything')
+        obj.should_not be_null_object
+      end
+    end
+    
+    describe "#as_null_object" do
+      it "should set the object to null_object" do
+        obj = mock('anything').as_null_object
+        obj.should be_null_object
+      end
+    end
   end
 end

data/spec/spec/mocks/options_hash_spec.rb

@@ -3,42 +3,32 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 module Spec
   module Mocks
     describe "calling :should_receive with an options hash" do
-      it_should_behave_like "sandboxed rspec_options"
-      attr_reader :reporter, :example_group
-      before do
-        @reporter = ::Spec::Runner::Reporter.new(options)
-        @example_group = Class.new(::Spec::Example::ExampleGroup) do
-          plugin_mock_framework
-          describe("Some Examples")
-        end
-        reporter.add_example_group example_group
-      end
-
       it "should report the file and line submitted with :expected_from" do
-        example_definition = example_group.it "spec" do
+        begin
           mock = Spec::Mocks::Mock.new("a mock")
           mock.should_receive(:message, :expected_from => "/path/to/blah.ext:37")
           mock.rspec_verify
+        rescue => e
+        ensure
+          e.backtrace.to_s.should =~ /\/path\/to\/blah.ext:37/m
         end
-        example = example_group.new(example_definition)
-        
-        reporter.should_receive(:example_finished) do |spec, error|
-          error.backtrace.detect {|line| line =~ /\/path\/to\/blah.ext:37/}.should_not be_nil
-        end
-        example.execute(options, {})
       end
 
       it "should use the message supplied with :message" do
-        example_definition = @example_group.it "spec" do
-          mock = Spec::Mocks::Mock.new("a mock")
-          mock.should_receive(:message, :message => "recebi nada")
-          mock.rspec_verify
-        end
-        example = @example_group.new(example_definition)
-        @reporter.should_receive(:example_finished) do |spec, error|
-          error.message.should == "recebi nada"
-        end
-        example.execute(@options, {})
+        lambda {
+          m = Spec::Mocks::Mock.new("a mock")
+          m.should_receive(:message, :message => "recebi nada")
+          m.rspec_verify
+        }.should raise_error("recebi nada")
+      end
+      
+      it "should use the message supplied with :message after a similar stub" do
+        lambda {
+          m = Spec::Mocks::Mock.new("a mock")
+          m.stub!(:message)
+          m.should_receive(:message, :message => "from mock")
+          m.rspec_verify
+        }.should raise_error("from mock")
       end
     end
   end

data/spec/spec/mocks/partial_mock_spec.rb

@@ -74,6 +74,8 @@ module Spec
       end
       
       it "should use report nil in the error message" do
+        allow_message_expectations_on_nil
+        
         @this_will_resolve_to_nil.should_receive(:foobar)
         lambda do
           @this_will_resolve_to_nil.rspec_verify

data/spec/spec/mocks/passing_mock_argument_constraints_spec.rb

@@ -116,9 +116,28 @@ module Spec
       end
         
     end
+
+    describe Methods, "handling block constraints" do
+      it_should_behave_like "mock argument constraints"
+      
+      it "should match arguments against RSpec expectations" do
+        @mock.should_receive(:random_call).with {|arg1, arg2, arr, *rest|
+          arg1.should == 5
+          arg2.should have_at_least(3).characters
+          arg2.should have_at_most(10).characters
+          arr.map {|i| i * 2}.should == [2,4,6]
+          rest.should == [:fee, "fi", 4]
+        }
+        @mock.random_call 5, "hello", [1,2,3], :fee, "fi", 4
+      end
+    end
     
     describe Methods, "handling non-constraint arguments" do
-
+      
+      before(:each) do
+        @mock = Mock.new("test mock")
+      end
+      
       it "should match non special symbol (can be removed when deprecated symbols are removed)" do
         @mock.should_receive(:random_call).with(:some_symbol)
         @mock.random_call(:some_symbol)
@@ -150,11 +169,6 @@ module Spec
         @mock.should_receive(:random_call).with(:a => "a", :b => "b")
         @mock.random_call(opts)
       end
-      
-      it "should match against a Matcher" do
-        @mock.should_receive(:msg).with(equal(37))
-        @mock.msg(37)
-      end
     end
   end
 end

data/spec/spec/mocks/stub_spec.rb

@@ -14,6 +14,7 @@ module Spec
           end
         end
         @instance = @class.new
+        @stub = Object.new
       end
 
       it "should return expected value when expected message is received" do
@@ -44,6 +45,12 @@ module Spec
           @instance.rspec_verify
         end.should_not raise_error
       end
+
+      it "should handle multiple stubbed methods" do
+        @instance.stub!(:msg1 => 1, :msg2 => 2)
+        @instance.msg1.should == 1
+        @instance.msg2.should == 2
+      end
       
       it "should clear itself when verified" do
         @instance.stub!(:this_should_go).and_return(:blah)

data/spec/spec/runner/command_line_spec.rb

@@ -3,16 +3,16 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 module Spec
   module Runner
     describe CommandLine, ".run" do
-      it_should_behave_like "sandboxed rspec_options"
+      include SandboxedOptions
       attr_reader :options, :err, :out
       before do
         @err = options.error_stream
         @out = options.output_stream
       end
-
+      
       it "should run directory" do
         file = File.dirname(__FILE__) + '/../../../examples/pure'
-        Spec::Runner::CommandLine.run(OptionParser.parse([file,"-p","**/*.rb"], @err, @out))
+        run_with(OptionParser.parse([file,"-p","**/*.rb"], @err, @out))
 
         @out.rewind
         @out.read.should =~ /\d+ examples, 0 failures, 3 pending/n
@@ -20,7 +20,7 @@ module Spec
 
       it "should run file" do
         file = File.dirname(__FILE__) + '/../../../failing_examples/predicate_example.rb'
-        Spec::Runner::CommandLine.run(OptionParser.parse([file], @err, @out))
+        run_with(OptionParser.parse([file], @err, @out))
 
         @out.rewind
         @out.read.should =~ /2 examples, 1 failure/n
@@ -130,18 +130,11 @@ module Spec
         options.reporter.should_receive(:add_example_group).with(example_group)
 
         options.add_example_group example_group
-        Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out))
+        run_with(options)
 
         should_has_run.should be_true
         should_not_has_run.should be_false
       end
-
-      it "sets Spec.run to true" do
-        ::Spec.run = false
-        ::Spec.should_not be_run
-        Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out))
-        ::Spec.should be_run
-      end
     end
   end
 end

data/spec/spec/runner/drb_command_line_spec.rb

@@ -3,6 +3,8 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 module Spec
   module Runner
     describe DrbCommandLine, "without running local server" do
+      include SandboxedOptions
+      
       unless Config::CONFIG['ruby_install_name'] == 'jruby'
         it "should print error when there is no running local server" do
           err = StringIO.new
@@ -15,18 +17,22 @@ module Spec
       end    
     end
 
-    class DrbCommandLineSpec < ::Spec::Example::ExampleGroup
-      describe DrbCommandLine, "with local server"
+    describe "with local server" do
 
       class CommandLineForSpec
         def self.run(argv, stderr, stdout)
-          exit Spec::Runner::CommandLine.run(OptionParser.parse(argv, stderr, stdout))
+          orig_options = Spec::Runner.options
+          tmp_options = OptionParser.parse(argv, stderr, stdout)
+          Spec::Runner.use tmp_options
+          Spec::Runner::CommandLine.run(tmp_options)
+        ensure
+          Spec::Runner.use orig_options
         end
       end
       
       unless Config::CONFIG['ruby_install_name'] == 'jruby'
         before(:all) do
-          DRb.start_service("druby://localhost:8989", CommandLineForSpec)
+          DRb.start_service("druby://127.0.0.1:8989", CommandLineForSpec)
           @@drb_example_file_counter = 0
         end
 
@@ -45,7 +51,7 @@ module Spec
 
         it "should run against local server" do
           out = run_spec_via_druby(['--version'])
-          out.should =~ /RSpec/n
+          out.should =~ /rspec version \d+\.\d+\.\d+.*/n
         end
 
         it "should output green colorized text when running with --colour option" do
@@ -86,7 +92,8 @@ module Spec
           out.rewind; out.read
         end
       end
-
+      
     end
+
   end
 end