mocha 0.9.1 → 0.9.2

data/RELEASE

@@ -1,3 +1,8 @@
+= 0.9.2 (r355)
+* Improved documentation to address [#22530] 'Mock methods with multiple return values not possible?'
+* respond_with parameter matcher was not available in tests.
+* Patch [#22630] Fix for a bug in running Rails tests with Ruby 1.8.7. Array#flatten was being called which in turn was checking whether each element responded to #to_ary. This check was using the two parameter version of #respond_to?, but Mock was only defining a one parameter version.
+
 = 0.9.1 (r349)
 
 * Fixed bug #21465 - expects & stubs should support method names as strings (as well as symbols) or fail fast. Convert all expectation method names to a symbol in case they were supplied as a string.

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/testtask'
 require 'rake/contrib/sshpublisher'
 
 module Mocha
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end
 
 desc "Run all tests"
@@ -129,7 +129,7 @@ task 'examples' do
   end
 end
 
-Gem::manage_gems
+Gem.manage_gems if Gem::RubyGemsVersion < '1.2.0'
 
 specification = Gem::Specification.new do |s|
   s.name   = "mocha"

data/lib/mocha/expectation.rb

@@ -249,6 +249,12 @@ module Mocha # :nodoc:
     #   object.expected_method # => 1
     #   object.expected_method # => 2
     #   object.expected_method # => raises exception of class Exception1
+    # Note that in Ruby a method returning multiple values is exactly equivalent to a method returning an Array of those values.
+    #   object = mock()
+    #   object.stubs(:expected_method).returns([1, 2])
+    #   x, y = object.expected_method
+    #   x # => 1
+    #   y # => 2
     def returns(*values)
       @return_values += ReturnValues.build(*values)
       self

data/lib/mocha/mock.rb

@@ -165,9 +165,13 @@ module Mocha # :nodoc:
       end
     end
     
-    def respond_to?(symbol)
+    def respond_to?(symbol, include_private = false)
       if @responder then
-        @responder.respond_to?(symbol)
+        if @responder.method(:respond_to?).arity > 1
+          @responder.respond_to?(symbol, include_private)
+        else
+          @responder.respond_to?(symbol)
+        end
       else
         @expectations.matches_method?(symbol)
       end

data/lib/mocha/parameter_matchers.rb

@@ -23,4 +23,5 @@ require 'mocha/parameter_matchers/kind_of'
 require 'mocha/parameter_matchers/not'
 require 'mocha/parameter_matchers/optionally'
 require 'mocha/parameter_matchers/regexp_matches'
+require 'mocha/parameter_matchers/responds_with'
 require 'mocha/parameter_matchers/yaml_equivalent'

data/test/acceptance/parameter_matcher_test.rb

@@ -176,4 +176,34 @@ class ParameterMatcherTest < Test::Unit::TestCase
     assert_failed(test_result)
   end
 
-end
+  def test_should_match_parameter_that_responds_with_specified_value
+    klass = Class.new do
+      def quack
+        'quack'
+      end
+    end
+    duck = klass.new
+    test_result = run_test do
+      mock = mock()
+      mock.expects(:method).with(responds_with(:quack, 'quack'))
+      mock.method(duck)
+    end
+    assert_passed(test_result)
+  end
+
+  def test_should_not_match_parameter_that_does_not_respond_with_specified_value
+    klass = Class.new do
+      def quack
+        'woof'
+      end
+    end
+    duck = klass.new
+    test_result = run_test do
+      mock = mock()
+      mock.expects(:method).with(responds_with(:quack, 'quack'))
+      mock.method(duck)
+    end
+    assert_failed(test_result)
+  end
+
+end

data/test/unit/mock_test.rb

@@ -287,4 +287,9 @@ class MockTest < Test::Unit::TestCase
     end
   end
   
+  def test_should_handle_respond_to_with_private_methods_param_without_error
+    mock = Mock.new
+    assert_nothing_raised{ mock.respond_to?(:object_id, false) }
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mocha
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - James Mead
@@ -9,11 +9,12 @@ autorequire: mocha
 bindir: bin
 cert_chain: []
 
-date: 2008-08-30 00:00:00 +01:00
+date: 2008-11-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -216,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mocha
-rubygems_version: 1.1.1
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: Mocking and stubbing library