mocha 0.9.4 → 0.9.5

data/RELEASE

@@ -1,3 +1,9 @@
+= 0.9.5 (93cad010345ce5d68f31422cfc32ed9dd6de13ec)
+* Fixed Lighthouse bug #32 - stub_everything should mean mock responds to anything.
+* Added Expectation#twice to improve readability. Tthanks to pull request from Celestino Gomes.
+* In Ruby 1.9, requiring 'test/unit' loads a thin wrapper around MiniTest and Test::Unit::TestCase ends up inheriting from MiniTest::Unit::TestCase. So we need to avoid including the Mocha modules more than once to avoid nasty consequences. Thanks to Matthias Hennemeyer for help with this.
+* Ruby 1.9 includes rake, but not rake/contrib. For the moment I've moved the sshpublisher require into the only rake task that needs it, so that I can at least run the tests in Ruby 1.9. It looks like I will need to build a rake/contrib gem or similar to get this working properly - http://intertwingly.net/blog/2008/01/07/Rake-Contrib-for-1-9
+
 = 0.9.4 (8a59c6ff0f99f34b02bd99f19536a7893be2b340)
 * Added mocha.gemspec file generated with Chad Woolley's new rake task, so that a floehopper-mocha gem will get built on GitHub.
 * Add rake task to update mocha.gemspec with unique version, which will cause gem to be auto-built on github
@@ -5,7 +11,7 @@
 * Removed deprecated gem autorequire.
 
 = 0.9.3 (8219bb2d2881c8529c93fc21e97a11d01203c759)
-* Added support for MiniTest thanks to sprsquish.
+* Added support for MiniTest thanks to Jeff Smick.
 * Fixed a possible bug with some of the non-default Configuration options relating to the argument to Object#respond_to?
 * As per Jay Fields recommendations [1] and with further impetus from a talk at Ruby Manor, any methods added to core classes are now added by including a module. This means that Mocha is a better citizen of the Ruby world and it's behaviour is more easily extended. [1] http://blog.jayfields.com/2008/07/ruby-underuse-of-modules.html & http://blog.jayfields.com/2008/07/ruby-redefine-method-behavior.html
 * Removed deprecated gem autorequire.

data/Rakefile

@@ -2,10 +2,9 @@ require 'rubygems'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rake/testtask'
-require 'rake/contrib/sshpublisher'
 
 module Mocha
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end
 
 desc "Run all tests"
@@ -84,10 +83,13 @@ Rake::RDocTask.new('rdoc') do |task|
     'lib/mocha/stubbing_error.rb'
   )
 end
-task 'rdoc' => 'examples'
+
+desc "Generate all documentation"
+task 'generate_docs' => ['clobber_rdoc', 'rdoc', 'examples', 'agiledox.txt']
 
 desc "Upload RDoc to RubyForge"
-task 'publish_rdoc' => ['rdoc', 'examples'] do
+task 'publish_docs' do
+  require 'rake/contrib/sshpublisher'
   Rake::SshDirPublisher.new("jamesmead@rubyforge.org", "/var/www/gforge-projects/mocha", "doc").upload
 end
 
@@ -168,7 +170,6 @@ task :update_gemspec do
   end
 end
 
-
 task 'verify_user' do
   raise "RUBYFORGE_USER environment variable not set!" unless ENV['RUBYFORGE_USER']
 end
@@ -178,7 +179,7 @@ task 'verify_password' do
 end
 
 desc "Publish package files on RubyForge."
-task 'publish_packages' => ['verify_user', 'verify_password', 'package'] do
+task 'publish_packages' => ['verify_user', 'verify_password', 'clobber_package', 'package'] do
   $:.unshift File.expand_path(File.join(File.dirname(__FILE__), "vendor", "meta_project-0.4.15", "lib"))
   require 'meta_project'
   require 'rake/contrib/xforge'
@@ -197,3 +198,10 @@ task 'publish_packages' => ['verify_user', 'verify_password', 'package'] do
     release.release_notes = ''
   end
 end
+
+desc "Do a full release."
+task 'release' => ['default', 'generate_docs', 'publish_packages', 'publish_docs', 'update_gemspec'] do
+  puts
+  puts "*** Remember to commit newly generated gemspec after release ***"
+  puts
+end

data/lib/mocha.rb

@@ -37,11 +37,13 @@ end
 require 'mocha/test_case_adapter'
 require 'test/unit/testcase'
 
-module Test
-  module Unit
-    class TestCase
-      include Mocha::Standalone
-      include Mocha::TestCaseAdapter
+unless Test::Unit::TestCase.ancestors.include?(Mocha::Standalone)
+  module Test
+    module Unit
+      class TestCase
+        include Mocha::Standalone
+        include Mocha::TestCaseAdapter
+      end
     end
   end
 end

data/lib/mocha/any_instance_method.rb

@@ -17,7 +17,7 @@ module Mocha
     def hide_original_method
       if method_exists?(method)
         begin
-          stubbee.class_eval("alias_method :#{hidden_method}, :#{method}", __FILE__, __LINE__)
+          stubbee.send(:alias_method, hidden_method, method)
         rescue NameError
           # deal with nasties like ActiveRecord::Associations::AssociationProxy
         end
@@ -29,13 +29,14 @@ module Mocha
     end
 
     def remove_new_method
-      stubbee.class_eval("remove_method :#{method}", __FILE__, __LINE__)
+      stubbee.send(:remove_method, method)
     end
 
     def restore_original_method
       if method_exists?(hidden_method)
         begin
-          stubbee.class_eval("alias_method :#{method}, :#{hidden_method}; remove_method :#{hidden_method}", __FILE__, __LINE__)
+          stubbee.send(:alias_method, method, hidden_method)
+          stubbee.send(:remove_method, hidden_method)
         rescue NameError
           # deal with nasties like ActiveRecord::Associations::AssociationProxy
         end

data/lib/mocha/class_method.rb

@@ -29,7 +29,7 @@ module Mocha
     def hide_original_method
       if method_exists?(method)
         begin
-          stubbee.__metaclass__.class_eval("alias_method :#{hidden_method}, :#{method}", __FILE__, __LINE__)
+          stubbee.__metaclass__.send(:alias_method, hidden_method, method)
         rescue NameError
           # deal with nasties like ActiveRecord::Associations::AssociationProxy
         end
@@ -41,13 +41,14 @@ module Mocha
     end
   
     def remove_new_method
-      stubbee.__metaclass__.class_eval("remove_method :#{method}", __FILE__, __LINE__)
+      stubbee.__metaclass__.send(:remove_method, method)
     end
   
     def restore_original_method
       if method_exists?(hidden_method)
         begin
-          stubbee.__metaclass__.class_eval("alias_method :#{method}, :#{hidden_method}; remove_method :#{hidden_method}", __FILE__, __LINE__)
+          stubbee.__metaclass__.send(:alias_method, method, hidden_method)
+          stubbee.__metaclass__.send(:remove_method, hidden_method)
         rescue NameError
           # deal with nasties like ActiveRecord::Associations::AssociationProxy
         end

data/lib/mocha/expectation.rb

@@ -43,6 +43,31 @@ module Mocha # :nodoc:
       self
     end
   
+    # :call-seq: twice() -> expectation
+    #
+    # Modifies expectation so that the expected method must be called exactly twice.
+    #   object = mock()
+    #   object.expects(:expected_method).twice
+    #   object.expected_method
+    #   object.expected_method
+    #   # => verify succeeds
+    #
+    #   object = mock()
+    #   object.expects(:expected_method).twice
+    #   object.expected_method
+    #   object.expected_method
+    #   object.expected_method
+    #   # => verify fails
+    #
+    #   object = mock()
+    #   object.expects(:expected_method).twice
+    #   object.expected_method
+    #   # => verify fails
+    def twice
+      @cardinality = Cardinality.exactly(2)
+      self
+    end
+  
     # :call-seq: once() -> expectation
     #
     # Modifies expectation so that the expected method must be called exactly once.

data/lib/mocha/mock.rb

@@ -173,7 +173,7 @@ module Mocha # :nodoc:
           @responder.respond_to?(symbol)
         end
       else
-        @expectations.matches_method?(symbol)
+        @everything_stubbed || @expectations.matches_method?(symbol)
       end
     end
     

data/test/acceptance/expected_invocation_count_test.rb

@@ -35,7 +35,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   def test_should_pass_if_method_is_expected_twice_and_is_called_twice
     test_result = run_test do
       mock = mock('mock')
-      mock.expects(:method).times(2)
+      mock.expects(:method).twice
       2.times { mock.method }
     end
     assert_passed(test_result)
@@ -44,7 +44,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   def test_should_fail_if_method_is_expected_twice_but_is_called_once
     test_result = run_test do
       mock = mock('mock')
-      mock.expects(:method).times(2)
+      mock.expects(:method).twice
       1.times { mock.method }
     end
     assert_failed(test_result)
@@ -54,7 +54,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   def test_should_fail_fast_if_method_is_expected_twice_but_is_called_three_times
     test_result = run_test do
       mock = mock('mock')
-      mock.expects(:method).times(2)
+      mock.expects(:method).twice
       3.times { mock.method }
     end
     assert_failed(test_result)

data/test/unit/expectation_test.rb

@@ -253,6 +253,27 @@ class ExpectationTest < Test::Unit::TestCase
     assert expectation.verified?
   end
 
+  def test_should_not_verify_successfully_if_call_expected_twice_and_invoked_three_times
+    expectation = new_expectation.twice
+    expectation.invoke
+    expectation.invoke
+    expectation.invoke
+    assert !expectation.verified?
+  end
+
+  def test_should_not_verify_successfully_if_call_expected_twice_but_invoked_once
+    expectation = new_expectation.twice
+    expectation.invoke
+    assert !expectation.verified?
+  end
+
+  def test_should_verify_successfully_if_call_expected_twice_and_invoked_twice
+    expectation = new_expectation.twice
+    expectation.invoke
+    expectation.invoke
+    assert expectation.verified?
+  end
+
   def test_should_verify_successfully_if_expected_call_was_made_at_least_once
     expectation = new_expectation.at_least_once
     3.times {expectation.invoke}

data/test/unit/mock_test.rb

@@ -292,4 +292,11 @@ class MockTest < Test::Unit::TestCase
     assert_nothing_raised{ mock.respond_to?(:object_id, false) }
   end
   
+  def test_should_respond_to_any_method_if_stubbing_everything
+    mock = Mock.new
+    mock.stub_everything
+    assert mock.respond_to?(:abc)
+    assert mock.respond_to?(:xyz)
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mocha
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - James Mead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-30 00:00:00 +00:00
+date: 2009-02-01 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency