rspec-mocks 2.4.0 → 2.5.0

data/Rakefile

@@ -5,15 +5,6 @@ Bundler::GemHelper.install_tasks
 require 'rake'
 require 'rspec/core/rake_task'
 require 'rspec/mocks/version'
-require 'cucumber/rake/task'
-
-class Cucumber::Rake::Task::ForkedCucumberRunner
-  # When cucumber shells out, we still need it to run in the context of our
-  # bundle.
-  def run
-    sh "bundle exec #{RUBY} " + args.join(" ")
-  end
-end
 
 task :cleanup_rcov_files do
   rm_rf 'coverage.data'
@@ -24,8 +15,6 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = %w[--color]
 end
 
-Cucumber::Rake::Task.new(:cucumber)
-
 namespace :spec do
   desc "Run all examples using rcov"
   RSpec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|
@@ -35,17 +24,35 @@ namespace :spec do
   end
 end
 
-namespace :cucumber do
-  desc "Run cucumber features using rcov"
-  Cucumber::Rake::Task.new :rcov => :cleanup_rcov_files do |t|
-    t.cucumber_opts = %w{--format progress}
-    t.rcov = true
-    t.rcov_opts =  %[-Ilib -Ispec --exclude "gems/*,features"]
-    t.rcov_opts << %[--text-report --sort coverage --aggregate coverage.data]
+task :default => :spec
+
+begin
+  require 'cucumber/rake/task'
+
+  class Cucumber::Rake::Task::ForkedCucumberRunner
+    # When cucumber shells out, we still need it to run in the context of our
+    # bundle.
+    def run
+      sh "bundle exec #{RUBY} " + args.join(" ")
+    end
   end
-end
 
-task :default => [:spec, :cucumber]
+  Cucumber::Rake::Task.new(:cucumber)
+
+  namespace :cucumber do
+    desc "Run cucumber features using rcov"
+    Cucumber::Rake::Task.new :rcov => :cleanup_rcov_files do |t|
+      t.cucumber_opts = %w{--format progress}
+      t.rcov = true
+      t.rcov_opts =  %[-Ilib -Ispec --exclude "gems/*,features"]
+      t.rcov_opts << %[--text-report --sort coverage --aggregate coverage.data]
+    end
+  end
+
+  task :default => :cucumber
+rescue LoadError
+  $stderr.puts "unable to load cucumber, some tasks unavailable"
+end
 
 task :clobber do
   rm_rf 'pkg'
@@ -66,5 +73,3 @@ task :relish, :version do |t, args|
   raise "rake relish[VERSION]" unless args[:version]
   sh "relish push rspec/rspec-mocks:#{args[:version]}"
 end
-
-task :default => [:spec, :cucumber]

data/features/.nav

@@ -1,3 +1,5 @@
+- Upgrade.md
+- Changelog.md
 - method_stubs:
   - simple_return_value.feature
   - stub_implementation.feature

data/{History.markdown → features/Changelog.md}

@@ -1,4 +1,12 @@
-## rspec-mocks release history (incomplete)
+### 2.5.0 / 2011-02-05
+
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.4.0...v2.5.0)
+
+* Bug fixes
+  * message expectation counts now work in combination with a stub (Damian
+    Nurzynski)
+  * fix failure message when message received with incorrect args (Josep M.
+    Bach)
 
 ### 2.4.0 / 2011-01-02
 

data/features/message_expectations/README.md

@@ -1,5 +1,4 @@
-We're working on improving these docs. In the mean time, here's a cheat sheet
-to cover the basics.
+### Basics
 
     # create a double
     obj = double()

data/features/method_stubs/README.md

@@ -1,5 +1,4 @@
-We're working on improving these docs. In the mean time, here's a cheat sheet
-to cover the basics.
+### Basics
 
     # create a double
     obj = double()

data/lib/rspec/mocks/message_expectation.rb

@@ -24,6 +24,7 @@ module RSpec
         @order_group = expectation_ordering
         @at_least = nil
         @at_most = nil
+        @exactly = nil
         @args_to_yield = []
         @failed_fast = nil
         @args_to_yield_were_cloned = false
@@ -286,13 +287,13 @@ module RSpec
   
       def once(&block)
         @method_block = block if block
-        @expected_received_count = 1
+        set_expected_received_count :exactly, 1
         self
       end
   
       def twice(&block)
         @method_block = block if block
-        @expected_received_count = 2
+        set_expected_received_count :exactly, 2
         self
       end
   
@@ -307,10 +308,19 @@ module RSpec
         return false
       end
       
+      def actual_received_count_matters?
+        @at_least || @at_most || @exactly
+      end
+
+      def increase_actual_received_count!
+        @actual_received_count += 1
+      end
+
       protected
         def set_expected_received_count(relativity, n)
           @at_least = (relativity == :at_least)
           @at_most = (relativity == :at_most)
+          @exactly = (relativity == :exactly)
           @expected_received_count = case n
             when Numeric
               n
@@ -324,7 +334,7 @@ module RSpec
         def clear_actual_received_count!
           @actual_received_count = 0
         end
-      
+
     end
     
     class NegativeMessageExpectation < MessageExpectation

data/lib/rspec/mocks/proxy.rb

@@ -96,6 +96,7 @@ module RSpec
         stub = find_matching_method_stub(method_name, *args)
 
         if (stub && expectation && expectation.called_max_times?) || (stub && !expectation)
+          expectation.increase_actual_received_count! if expectation && expectation.actual_received_count_matters?
           if expectation = find_almost_matching_expectation(method_name, *args)
             expectation.advise(*args) unless expectation.expected_messages_received?
           end
@@ -141,7 +142,7 @@ module RSpec
       end
 
       def find_almost_matching_expectation(method_name, *args)
-        method_double[method_name].expectations.find {|expectation| expectation.matches_name_but_not_args(method_name, *args)}
+        method_double[method_name].expectations.find {|expectation| expectation.matches_name_but_not_args(method_name, *args) && !expectation.called_max_times?}
       end
 
       def find_matching_method_stub(method_name, *args)

data/lib/rspec/mocks/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Mocks # :nodoc:
     module Version # :nodoc:
-      STRING = '2.4.0'
+      STRING = '2.5.0'
     end
   end
 end

data/spec/rspec/mocks/mock_spec.rb

@@ -109,6 +109,17 @@ module RSpec
         }.should raise_error(RSpec::Mocks::MockExpectationError, "Double \"test double\" received :something with unexpected arguments\n  expected: (\"a\", \"b\", \"c\")\n       got: (\"a\", \"d\", \"c\")")
       end
 
+      describe "even when a similar expectation with different arguments exist" do
+        it "raises exception if args don't match when method called, correctly reporting the offending arguments" do
+          @mock.should_receive(:something).with("a","b","c").once
+          @mock.should_receive(:something).with("z","x","c").once
+          lambda {
+            @mock.something("a","b","c")
+            @mock.something("z","x","g")
+          }.should raise_error(RSpec::Mocks::MockExpectationError, "Double \"test double\" received :something with unexpected arguments\n  expected: (\"z\", \"x\", \"c\")\n       got: (\"z\", \"x\", \"g\")")
+        end
+      end
+
       it "raises exception if args don't match when method called even when the method is stubbed" do
         @mock.stub(:something)
         @mock.should_receive(:something).with("a","b","c")

data/spec/rspec/mocks/multiple_return_value_spec.rb

@@ -8,7 +8,7 @@ module RSpec
         @return_values = ["1",2,Object.new]
         @mock.should_receive(:message).and_return(@return_values[0],@return_values[1],@return_values[2])
       end
-      
+
       it "returns values in order to consecutive calls" do
         @mock.message.should == @return_values[0]
         @mock.message.should == @return_values[1]
@@ -20,7 +20,7 @@ module RSpec
         @mock.message.should == @return_values[0]
         @mock.message.should == @return_values[1]
         expect { @mock.rspec_verify }.to raise_error(
-          RSpec::Mocks::MockExpectationError, 
+          RSpec::Mocks::MockExpectationError,
           %Q|(Mock "mock").message(any args)\n    expected: 3 times\n    received: 2 times|
         )
       end
@@ -31,10 +31,19 @@ module RSpec
         @mock.message.should == @return_values[2]
         @mock.message.should == @return_values[2]
         expect { @mock.rspec_verify }.to raise_error(
-          RSpec::Mocks::MockExpectationError, 
+          RSpec::Mocks::MockExpectationError,
           %Q|(Mock "mock").message(any args)\n    expected: 3 times\n    received: 4 times|
         )
       end
+
+      it "doesn't complain when there are too many calls but method is stubbed too" do
+        @mock.stub(:message).and_return :stub_result
+        @mock.message.should == @return_values[0]
+        @mock.message.should == @return_values[1]
+        @mock.message.should == @return_values[2]
+        @mock.message.should == :stub_result
+        expect { @mock.rspec_verify }.to_not raise_error(RSpec::Mocks::MockExpectationError)
+      end
     end
 
     describe "a Mock expectation with multiple return values with a specified count equal to the number of values" do
@@ -56,7 +65,7 @@ module RSpec
         @mock.message.should == @return_values[0]
         @mock.message.should == @return_values[1]
         expect { @mock.rspec_verify }.to raise_error(
-          RSpec::Mocks::MockExpectationError, 
+          RSpec::Mocks::MockExpectationError,
           %Q|(Mock "mock").message(any args)\n    expected: 3 times\n    received: 2 times|
         )
       end
@@ -68,7 +77,20 @@ module RSpec
         @mock.message.should == @return_values[2]
         @mock.message.should == @return_values[2]
         expect { @mock.rspec_verify }.to raise_error(
-          RSpec::Mocks::MockExpectationError, 
+          RSpec::Mocks::MockExpectationError,
+          %Q|(Mock "mock").message(any args)\n    expected: 3 times\n    received: 4 times|
+        )
+      end
+
+      it "complains when there are too many calls and method is stubbed too" do
+        third = Object.new
+        @mock.stub(:message).and_return :stub_result
+        @mock.message.should == @return_values[0]
+        @mock.message.should == @return_values[1]
+        @mock.message.should == @return_values[2]
+        @mock.message.should == :stub_result
+        expect { @mock.rspec_verify }.to raise_error(
+          RSpec::Mocks::MockExpectationError,
           %Q|(Mock "mock").message(any args)\n    expected: 3 times\n    received: 4 times|
         )
       end
@@ -79,7 +101,7 @@ module RSpec
         @mock = RSpec::Mocks::Mock.new("mock")
         @mock.should_receive(:message).at_least(:twice).with(no_args).and_return(11, 22)
       end
-      
+
       it "uses the last return value for subsequent calls" do
         @mock.message.should equal(11)
         @mock.message.should equal(22)
@@ -90,10 +112,30 @@ module RSpec
       it "fails when called less than the specified number" do
         @mock.message.should equal(11)
         expect { @mock.rspec_verify }.to raise_error(
-          RSpec::Mocks::MockExpectationError, 
+          RSpec::Mocks::MockExpectationError,
           %Q|(Mock "mock").message(no args)\n    expected: 2 times\n    received: 1 time|
         )
       end
+
+      context "when method is stubbed too" do
+        before { @mock.stub(:message).and_return :stub_result }
+
+        it "uses the stub return value for subsequent calls" do
+          @mock.message.should equal(11)
+          @mock.message.should equal(22)
+          @mock.message.should equal(:stub_result)
+          @mock.rspec_verify
+        end
+
+        it "fails when called less than the specified number" do
+          @mock.message.should equal(11)
+          expect { @mock.rspec_verify }.to raise_error(
+            RSpec::Mocks::MockExpectationError,
+            %Q|(Mock "mock").message(no args)\n    expected: 2 times\n    received: 1 time|
+          )
+        end
+      end
+
     end
 
     describe "a Mock expectation with multiple return values with a specified count larger than the number of values" do
@@ -101,7 +143,7 @@ module RSpec
         @mock = RSpec::Mocks::Mock.new("mock")
         @mock.should_receive(:message).exactly(3).times.and_return(11, 22)
       end
-      
+
       it "uses the last return value for subsequent calls" do
         @mock.message.should equal(11)
         @mock.message.should equal(22)
@@ -112,7 +154,7 @@ module RSpec
       it "fails when called less than the specified number" do
         @mock.message.should equal(11)
         expect { @mock.rspec_verify }.to raise_error(
-          RSpec::Mocks::MockExpectationError, 
+          RSpec::Mocks::MockExpectationError,
           %Q|(Mock "mock").message(any args)\n    expected: 3 times\n    received: 1 time|
         )
       end
@@ -123,10 +165,26 @@ module RSpec
         @mock.message.should equal(22)
         @mock.message.should equal(22)
         expect { @mock.rspec_verify }.to raise_error(
-          RSpec::Mocks::MockExpectationError, 
+          RSpec::Mocks::MockExpectationError,
           %Q|(Mock "mock").message(any args)\n    expected: 3 times\n    received: 4 times|
         )
       end
+
+      context "when method is stubbed too" do
+        before { @mock.stub(:message).and_return :stub_result }
+
+        it "fails when called greater than the specified number" do
+          @mock.message.should equal(11)
+          @mock.message.should equal(22)
+          @mock.message.should equal(22)
+          @mock.message.should equal(:stub_result)
+          expect { @mock.rspec_verify }.to raise_error(
+            RSpec::Mocks::MockExpectationError,
+            %Q|(Mock "mock").message(any args)\n    expected: 3 times\n    received: 4 times|
+          )
+        end
+
+      end
     end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-mocks
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: false
   segments: 
   - 2
-  - 4
+  - 5
   - 0
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors: 
 - David Chelimsky
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-02 00:00:00 -06:00
+date: 2011-02-05 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -33,15 +34,15 @@ files:
 - .gitignore
 - Gemfile
 - Guardfile
-- History.markdown
 - License.txt
 - README.md
 - Rakefile
-- Upgrade.markdown
 - autotest/discover.rb
 - cucumber.yml
 - features/.nav
+- features/Changelog.md
 - features/README.markdown
+- features/Upgrade.md
 - features/message_expectations/README.md
 - features/message_expectations/block_local_expectations.feature.pending
 - features/message_expectations/expect_message.feature
@@ -132,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1914883193122525774
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -141,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1914883193122525774
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -151,9 +152,11 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.4.0
+summary: rspec-mocks-2.5.0
 test_files: 
+- features/Changelog.md
 - features/README.markdown
+- features/Upgrade.md
 - features/message_expectations/README.md
 - features/message_expectations/block_local_expectations.feature.pending
 - features/message_expectations/expect_message.feature