mocha 0.9.9 → 0.9.10

data/README.rdoc

@@ -26,9 +26,9 @@ Or download Mocha...
 
 == Examples
 
-* Quick Start - {Usage Examples}[link:examples/misc.html]
-* Traditional mocking - {Star Trek Example}[link:examples/mocha.html]
-* Setting expectations on real classes - {Order Example}[link:examples/stubba.html]
+* Quick Start - {Usage Examples}[http://mocha.rubyforge.org/examples/misc.html]
+* Traditional mocking - {Star Trek Example}[http://mocha.rubyforge.org/examples/mocha.html]
+* Setting expectations on real classes - {Order Example}[http://mocha.rubyforge.org/examples/stubba.html]
 * More examples on {Floehopper's Blog}[http://blog.floehopper.org]
 * {Mailing List Archives}[http://groups.google.com/group/mocha-developer]
 

data/RELEASE.rdoc

@@ -1,3 +1,9 @@
+= 0.9.10 ()
+* Added Mocha::ObjectMethods#unstub method - https://github.com/floehopper/mocha/issues#issue/6
+* Inherit Mocha::ExpectationError from Exception instead of StandardError to reduce the chances of a test passing by accident - thanks to James Sanders (jsanders) - https://github.com/floehopper/mocha/issues#issue/15
+* Fixed bug - GitHub README page to link correctly to code examples - https://github.com/floehopper/mocha/issues/closed#issue/11
+* Fixed bug - PASSTHROUGH_EXCEPTIONS are defined on MiniTest::Unit::TestCase not in Mocha - thanks to Brian Troutwine (blt) - https://github.com/floehopper/mocha/issues/closed#issue/14
+
 = 0.9.9 (ee3a79db4d52c3339e8acf07505e01236a2b4810)
 * Avoid loading bits of the test-unit gem by accident. This is an attempt at a fix for the problem that James Adam reported [1]. By using 'load' instead of 'require' to detect the version of Test::Unit, we can avoid rubygems trying to load bits of the test-unit gem when it's not wanted. [1] http://floehopper.lighthouseapp.com/projects/22289-mocha/tickets/50#ticket-50-13
 * Fix exception when running rake without test-unit gem. When test-unit gem >=v2.0.0 was installed but the "use_test_unit_gem" MOCHA_OPTIONS was not specified, a "comparison of Fixnum with Hash failed" exception was being raised when running the performance tests. This was because bits of the test-unit gem were being loaded accidentally and a Hash was being incorrectly supplied to the TestRunner.run method.

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 require 'rake/testtask'
 
 module Mocha
-  VERSION = "0.9.9"
+  VERSION = "0.9.10"
 end
 
 desc "Run all tests"
@@ -174,7 +174,7 @@ Rake::GemPackageTask.new(specification) do |package|
 end
 
 desc 'Generate updated gemspec with unique version, which will cause gem to be auto-built on github.'
-task :update_gemspec do
+task :gemspec do
   File.open('mocha.gemspec', 'w') do |output|
     output << build_specification(Mocha::VERSION + '.' + Time.now.strftime('%Y%m%d%H%M%S')).to_ruby
   end
@@ -209,7 +209,7 @@ task 'publish_packages' => ['verify_user', 'verify_password', 'clobber_package',
 end
 
 desc "Do a full release."
-task 'release' => ['default', 'generate_docs', 'publish_packages', 'publish_docs', 'update_gemspec'] do
+task 'release' => ['default', 'generate_docs', 'publish_packages', 'publish_docs', 'gemspec'] do
   puts
   puts "*** Remember to commit newly generated gemspec after release ***"
   puts

data/lib/mocha/central.rb

@@ -15,10 +15,16 @@ module Mocha
       end
     end
     
-    def unstub_all
-      while stubba_methods.length > 0
-        method = stubba_methods.pop
+    def unstub(method)
+      if stubba_methods.include?(method)
         method.unstub
+        stubba_methods.delete(method)
+      end
+    end
+    
+    def unstub_all
+      while stubba_methods.any? do
+        unstub(stubba_methods.first)
       end
     end
 

data/lib/mocha/expectation_error.rb

@@ -2,7 +2,7 @@ require 'mocha/backtrace_filter'
 
 module Mocha
 
-  class ExpectationError < StandardError
+  class ExpectationError < Exception
     
     def initialize(message = nil, backtrace = [])
       super(message)

data/lib/mocha/integration/mini_test/version_142_and_above.rb

@@ -35,7 +35,7 @@ module Mocha
             ensure
               begin
                 self.teardown
-              rescue *PASSTHROUGH_EXCEPTIONS
+              rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
                 raise
               rescue Exception => e
                 result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))

data/lib/mocha/mock.rb

@@ -6,6 +6,7 @@ require 'mocha/method_matcher'
 require 'mocha/parameters_matcher'
 require 'mocha/unexpected_invocation'
 require 'mocha/argument_iterator'
+require 'mocha/mockery'
 
 module Mocha # :nodoc:
   

data/lib/mocha/object.rb

@@ -101,6 +101,39 @@ module Mocha
       }
       expectation
     end
+    
+    # :call-seq: unstub(*method_names)
+    #
+    # Removes the method stub added by calls to #expects or #stubs.
+    # Restores the original behaviour of the method before it was stubbed.
+    #   multiplier = Multiplier.new
+    #   multiplier.double(2) # => 4
+    #   multiplier.stubs(:double).raises
+    #   multiplier.double(2) # => raises exception
+    #   multiplier.unstubs(:double)
+    #   multiplier.double(2) # => 4
+    #
+    # The original implementation of <tt>Multiplier#double</tt> is replaced temporarily.
+    #
+    # The original implementation of <tt>Multiplier#double</tt> is restored when #unstub is called.
+    #
+    # WARNING: If you #unstub a method which still has unsatisfied expectations, you may be removing
+    # the only way those expectations can be satisfied. Use #unstub with care.
+    #
+    # If multiple +method_names+ are supplied, each method is unstubbed.
+    #   multiplier.unstub(:double, :triple)
+    #
+    #   # exactly equivalent to
+    #
+    #   multiplier.unstub(:double)
+    #   multiplier.unstub(:triple)
+    def unstub(*method_names)
+      mockery = Mocha::Mockery.instance
+      method_names.each do |method_name|
+        method = stubba_method.new(stubba_object, method_name)
+        mockery.stubba.unstub(method)
+      end
+    end
   
     def method_exists?(method, include_public_methods = true) # :nodoc:
       if include_public_methods

data/test/acceptance/exception_rescue_test.rb

@@ -0,0 +1,58 @@
+require File.expand_path('../acceptance_test_helper', __FILE__)
+require 'mocha'
+
+class ExceptionRescueTest < Test::Unit::TestCase
+
+  include AcceptanceTest
+
+  def setup
+    setup_acceptance_test
+  end
+
+  def teardown
+    teardown_acceptance_test
+  end
+
+  def test_unexpected_invocation_exception_is_not_caught_by_standard_rescue
+    test_result = run_as_test do
+      mock = mock('mock')
+      begin
+        mock.some_method
+      rescue => e
+        flunk "should not rescue #{e.class}"
+      end
+    end
+    assert_failed(test_result)
+    failure_message_lines = test_result.failure_messages.first.split("\n")
+    assert_equal "unexpected invocation: #<Mock:mock>.some_method()", failure_message_lines.first
+  end
+
+  def test_invocation_never_expected_exception_is_not_caught_by_standard_rescue
+    test_result = run_as_test do
+      mock = mock('mock')
+      mock.expects(:some_method).never
+      begin
+        mock.some_method
+      rescue => e
+        flunk "should not rescue #{e.class}"
+      end
+    end
+    assert_failed(test_result)
+    failure_message_lines = test_result.failure_messages.first.split("\n")
+    assert_equal "unexpected invocation: #<Mock:mock>.some_method()", failure_message_lines.first
+  end
+
+  def test_unsatisfied_expectation_exception_is_not_caught_by_standard_rescue
+    test_result = run_as_test do
+      mock = mock('mock')
+      mock.expects(:some_method)
+    end
+    assert_failed(test_result)
+    failure_message_lines = test_result.failure_messages.first.split("\n")
+    assert_equal [
+      "not all expectations were satisfied",
+      "unsatisfied expectations:",
+      "- expected exactly once, not yet invoked: #<Mock:mock>.some_method(any_parameters)"
+    ], failure_message_lines
+  end
+end

data/test/acceptance/unstubbing_test.rb

@@ -0,0 +1,122 @@
+require File.expand_path('../acceptance_test_helper', __FILE__)
+require 'mocha'
+
+class UnstubbingTest < Test::Unit::TestCase
+
+  include AcceptanceTest
+
+  def setup
+    setup_acceptance_test
+  end
+
+  def teardown
+    teardown_acceptance_test
+  end
+
+  def test_unstubbing_an_instance_method_should_restore_original_behaviour
+    klass = Class.new do
+      def my_instance_method; :original_return_value; end
+    end
+    test_result = run_as_test do
+      object = klass.new
+      object.stubs(:my_instance_method).returns(:new_return_value)
+      object.unstub(:my_instance_method)
+      assert_equal :original_return_value, object.my_instance_method
+    end
+    assert_passed(test_result)
+  end
+
+  def test_unstubbing_a_class_method_should_restore_original_behaviour
+    klass = Class.new do
+      def self.my_class_method; :original_return_value; end
+    end
+    test_result = run_as_test do
+      klass.stubs(:my_class_method).returns(:new_return_value)
+      klass.unstub(:my_class_method)
+      assert_equal :original_return_value, klass.my_class_method
+    end
+    assert_passed(test_result)
+  end
+
+  def test_unstubbing_a_module_method_should_restore_original_behaviour
+    mod = Module.new do
+      def self.my_module_method; :original_return_value; end
+    end
+    test_result = run_as_test do
+      mod.stubs(:my_module_method).returns(:new_return_value)
+      mod.unstub(:my_module_method)
+      assert_equal :original_return_value, mod.my_module_method
+    end
+    assert_passed(test_result)
+  end
+
+  def test_unstubbing_an_any_instance_method_should_restore_original_behaviour
+    klass = Class.new do
+      def my_instance_method; :original_return_value; end
+    end
+    test_result = run_as_test do
+      object = klass.new
+      klass.any_instance.stubs(:my_instance_method).returns(:new_return_value)
+      klass.any_instance.unstub(:my_instance_method)
+      assert_equal :original_return_value, object.my_instance_method
+    end
+    assert_passed(test_result)
+  end
+
+  def test_unstubbing_multiple_methods_should_restore_original_behaviour
+    klass = Class.new do
+      def my_first_instance_method; :original_return_value; end
+      def my_second_instance_method; :original_return_value; end
+    end
+    test_result = run_as_test do
+      object = klass.new
+      object.stubs(:my_first_instance_method).returns(:new_return_value)
+      object.stubs(:my_second_instance_method).returns(:new_return_value)
+      object.unstub(:my_first_instance_method, :my_second_instance_method)
+      assert_equal :original_return_value, object.my_first_instance_method
+      assert_equal :original_return_value, object.my_second_instance_method
+    end
+    assert_passed(test_result)
+  end
+
+  def test_unstubbing_a_method_multiple_times_should_restore_original_behaviour
+    klass = Class.new do
+      def my_instance_method; :original_return_value; end
+    end
+    test_result = run_as_test do
+      object = klass.new
+      object.stubs(:my_instance_method).returns(:new_return_value)
+      object.unstub(:my_instance_method)
+      object.unstub(:my_instance_method)
+      assert_equal :original_return_value, object.my_instance_method
+    end
+    assert_passed(test_result)
+  end
+
+  def test_unstubbing_a_non_stubbed_method_should_do_nothing
+    klass = Class.new do
+      def my_instance_method; :original_return_value; end
+    end
+    test_result = run_as_test do
+      object = klass.new
+      object.unstub(:my_instance_method)
+      assert_equal :original_return_value, object.my_instance_method
+    end
+    assert_passed(test_result)
+  end
+
+  def test_unstubbing_a_method_which_was_stubbed_multiple_times_should_restore_orginal_behaviour
+    klass = Class.new do
+      def my_instance_method; :original_return_value; end
+    end
+    test_result = run_as_test do
+      object = klass.new
+      object.stubs(:my_instance_method).with(:first).returns(:first_new_return_value)
+      object.stubs(:my_instance_method).with(:second).returns(:second_new_return_value)
+      object.unstub(:my_instance_method)
+      assert_equal :original_return_value, object.my_instance_method
+    end
+    assert_passed(test_result)
+  end
+
+end

data/test/unit/central_test.rb

@@ -47,6 +47,32 @@ class CentralTest < Test::Unit::TestCase
     assert_equal [method], stubba.stubba_methods
   end
   
+  def test_should_unstub_specified_method
+    stubba = Central.new
+    method_1 = Mock.new
+    method_2 = Mock.new
+    method_2.expects(:unstub)
+    stubba.stubba_methods = [method_1, method_2]
+
+    stubba.unstub(method_2)
+    
+    assert_equal [method_1], stubba.stubba_methods
+    assert method_2.__verified__?
+  end
+  
+  def test_should_not_unstub_specified_method_if_not_already_stubbed
+    stubba = Central.new
+    method_1 = Mock.new
+    method_2 = Mock.new
+    method_2.expects(:unstub).never
+    stubba.stubba_methods = [method_1]
+
+    stubba.unstub(method_2)
+    
+    assert_equal [method_1], stubba.stubba_methods
+    assert method_2.__verified__?
+  end
+  
   def test_should_unstub_all_methods
     stubba = Central.new
     method_1 = Mock.new

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mocha
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: false
   segments: 
   - 0
   - 9
-  - 9
-  version: 0.9.9
+  - 10
+  version: 0.9.10
 platform: ruby
 authors: 
 - James Mead
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-22 00:00:00 +01:00
+date: 2010-11-25 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -126,6 +126,7 @@ files:
 - test/acceptance/bug_18914_test.rb
 - test/acceptance/bug_21465_test.rb
 - test/acceptance/bug_21563_test.rb
+- test/acceptance/exception_rescue_test.rb
 - test/acceptance/expected_invocation_count_test.rb
 - test/acceptance/failure_messages_test.rb
 - test/acceptance/minitest_test.rb
@@ -158,6 +159,7 @@ files:
 - test/acceptance/stubbing_non_public_class_method_test.rb
 - test/acceptance/stubbing_non_public_instance_method_test.rb
 - test/acceptance/stubbing_on_non_mock_object_test.rb
+- test/acceptance/unstubbing_test.rb
 - test/deprecation_disabler.rb
 - test/execution_point.rb
 - test/method_definer.rb