mocha 1.9.0 → 1.10.0

data/test/acceptance/throw_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class ThrowTest < Mocha::TestCase
   include AcceptanceTest

data/test/acceptance/unexpected_invocation_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class UnexpectedInvocationTest < Mocha::TestCase
   include AcceptanceTest

data/test/acceptance/unstubbing_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class UnstubbingTest < Mocha::TestCase
   include AcceptanceTest

data/test/integration/shared_tests.rb

@@ -1,6 +1,7 @@
 require 'test_runner'
 require 'execution_point'
 
+# rubocop:disable Metrics/ModuleLength
 module SharedTests
   include TestRunner
 
@@ -63,7 +64,7 @@ module SharedTests
     assert_equal [
       'not all expectations were satisfied',
       'unsatisfied expectations:',
-      '- expected exactly once, not yet invoked: #<Mock:expecting invocation>.expected(any_parameters)'
+      '- expected exactly once, invoked never: #<Mock:expecting invocation>.expected(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -101,7 +102,7 @@ module SharedTests
     assert_equal [
       'not all expectations were satisfied',
       'unsatisfied expectations:',
-      '- expected exactly once, not yet invoked: #<Mock:expecting invocation>.expected(any_parameters)'
+      '- expected exactly once, invoked never: #<Mock:expecting invocation>.expected(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -151,7 +152,7 @@ module SharedTests
     assert_equal [
       'not all expectations were satisfied',
       'unsatisfied expectations:',
-      "- expected exactly once, not yet invoked: #{object.mocha_inspect}.expected(any_parameters)"
+      "- expected exactly once, invoked never: #{object.mocha_inspect}.expected(any_parameters)"
     ], test_result.failure_message_lines
   end
 
@@ -174,3 +175,4 @@ module SharedTests
   end
   # rubocop:enable Style/Semicolon
 end
+# rubocop:enable Metrics/ModuleLength

data/test/method_definer.rb

@@ -1,22 +1,16 @@
-require 'metaclass'
+require 'mocha/singleton_class'
 
-module Mocha
-  module ObjectMethods
-    def define_instance_method(method_symbol, &block)
-      __metaclass__.send(:define_method, method_symbol, block)
-    end
-
-    def replace_instance_method(method_symbol, &block)
-      raise "Cannot replace #{method_symbol} as #{self} does not respond to it." unless respond_to?(method_symbol)
-      define_instance_method(method_symbol, &block)
-    end
+module MethodDefiner
+  def define_instance_method(object, method_symbol, &block)
+    object.singleton_class.send(:define_method, method_symbol, block)
+  end
 
-    def define_instance_accessor(*symbols)
-      symbols.each { |symbol| __metaclass__.send(:attr_accessor, symbol) }
-    end
+  def replace_instance_method(object, method_symbol, &block)
+    raise "Cannot replace #{method_symbol} as #{self} does not respond to it." unless object.respond_to?(method_symbol)
+    define_instance_method(object, method_symbol, &block)
   end
-end
 
-class Object
-  include Mocha::ObjectMethods
+  def define_instance_accessor(object, *symbols)
+    symbols.each { |symbol| object.singleton_class.send(:attr_accessor, symbol) }
+  end
 end

data/test/test_runner.rb

@@ -7,6 +7,7 @@ module TestRunner
     run_as_tests(:test_me => block)
   end
 
+  # rubocop:disable Metrics/AbcSize
   def run_as_tests(methods = {})
     base_class = Mocha::TestCase
     test_class = Class.new(base_class) do
@@ -44,6 +45,7 @@ module TestRunner
 
     test_result
   end
+  # rubocop:enable Metrics/AbcSize
 
   def assert_passed(test_result)
     flunk "Test failed unexpectedly with message: #{test_result.failures}" if test_result.failure_count > 0

data/test/unit/any_instance_method_test.rb

@@ -1,14 +1,23 @@
 require File.expand_path('../../test_helper', __FILE__)
 require 'method_definer'
+require 'mocha/class_methods'
 require 'mocha/mock'
 require 'mocha/any_instance_method'
 
 class AnyInstanceMethodTest < Mocha::TestCase
+  include MethodDefiner
   include Mocha
 
+  def class_with_method(method, result = nil)
+    Class.new do
+      extend ClassMethods
+      define_method(method) { result } if method
+    end
+  end
+
   unless RUBY_V2_PLUS
     def test_should_hide_original_method
-      klass = Class.new { def method_x; end }
+      klass = class_with_method(:method_x)
       method = AnyInstanceMethod.new(klass, :method_x)
 
       method.hide_original_method
@@ -18,20 +27,20 @@ class AnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_not_raise_error_hiding_method_that_isnt_defined
-    klass = Class.new
+    klass = class_with_method(:irrelevant)
     method = AnyInstanceMethod.new(klass, :method_x)
 
     assert_nothing_raised { method.hide_original_method }
   end
 
   def test_should_define_a_new_method
-    klass = Class.new { def method_x; end }
+    klass = class_with_method(:method_x)
     method = AnyInstanceMethod.new(klass, :method_x)
     mocha = build_mock
     mocha.expects(:method_x).with(:param1, :param2).returns(:result)
     any_instance = Object.new
-    any_instance.define_instance_method(:mocha) { mocha }
-    klass.define_instance_method(:any_instance) { any_instance }
+    define_instance_method(any_instance, :mocha) { mocha }
+    define_instance_method(klass, :any_instance) { any_instance }
 
     method.hide_original_method
     method.define_new_method
@@ -44,19 +53,19 @@ class AnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_include_the_filename_and_line_number_in_exceptions
-    klass = Class.new { def method_x; end }
+    klass = class_with_method(:method_x)
     method = AnyInstanceMethod.new(klass, :method_x)
     mocha = build_mock
     mocha.stubs(:method_x).raises(Exception)
     any_instance = Object.new
-    any_instance.define_instance_method(:mocha) { mocha }
-    klass.define_instance_method(:any_instance) { any_instance }
+    define_instance_method(any_instance, :mocha) { mocha }
+    define_instance_method(klass, :any_instance) { any_instance }
 
     method.hide_original_method
     method.define_new_method
 
-    expected_filename = 'any_instance_method.rb'
-    expected_line_number = 30
+    expected_filename = 'stubbed_method.rb'
+    expected_line_number = 61
 
     exception = assert_raises(Exception) { klass.new.method_x }
     matching_line = exception.backtrace.find do |line|
@@ -68,11 +77,7 @@ class AnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_restore_original_method
-    klass = Class.new do
-      def method_x
-        :original_result
-      end
-    end
+    klass = class_with_method(:method_x, :original_result)
     method = AnyInstanceMethod.new(klass, :method_x)
 
     method.hide_original_method
@@ -86,11 +91,7 @@ class AnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_not_restore_original_method_if_none_was_defined_in_first_place
-    klass = Class.new do
-      def method_x
-        :new_result
-      end
-    end
+    klass = class_with_method(:method_x, :new_result)
     method = AnyInstanceMethod.new(klass, :method_x)
 
     method.restore_original_method
@@ -100,16 +101,16 @@ class AnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_call_remove_new_method
-    klass = Class.new { def method_x; end }
+    klass = class_with_method(:method_x)
     any_instance = build_mock
     any_instance_mocha = build_mock
     any_instance.stubs(:mocha).returns(any_instance_mocha)
-    klass.define_instance_method(:any_instance) { any_instance }
+    define_instance_method(klass, :any_instance) { any_instance }
     method = AnyInstanceMethod.new(klass, :method_x)
-    method.replace_instance_method(:restore_original_method) {}
-    method.replace_instance_method(:reset_mocha) {}
-    method.define_instance_accessor(:remove_called)
-    method.replace_instance_method(:remove_new_method) { self.remove_called = true }
+    replace_instance_method(method, :restore_original_method) {}
+    replace_instance_method(method, :reset_mocha) {}
+    define_instance_accessor(method, :remove_called)
+    replace_instance_method(method, :remove_new_method) { self.remove_called = true }
 
     method.unstub
 
@@ -117,16 +118,16 @@ class AnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_call_restore_original_method
-    klass = Class.new { def method_x; end }
+    klass = class_with_method(:method_x)
     any_instance = build_mock
     any_instance_mocha = build_mock
     any_instance.stubs(:mocha).returns(any_instance_mocha)
-    klass.define_instance_method(:any_instance) { any_instance }
+    define_instance_method(klass, :any_instance) { any_instance }
     method = AnyInstanceMethod.new(klass, :method_x)
-    method.replace_instance_method(:remove_new_method) {}
-    method.replace_instance_method(:reset_mocha) {}
-    method.define_instance_accessor(:restore_called)
-    method.replace_instance_method(:restore_original_method) { self.restore_called = true }
+    replace_instance_method(method, :remove_new_method) {}
+    replace_instance_method(method, :reset_mocha) {}
+    define_instance_accessor(method, :restore_called)
+    replace_instance_method(method, :restore_original_method) { self.restore_called = true }
 
     method.unstub
 
@@ -134,12 +135,12 @@ class AnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_call_mock_unstub
-    klass = Class.new { def method_x; end }
+    klass = class_with_method(:method_x)
 
     method = AnyInstanceMethod.new(klass, :method_x)
 
-    method.replace_instance_method(:remove_new_method) {}
-    method.replace_instance_method(:restore_original_method) {}
+    replace_instance_method(method, :remove_new_method) {}
+    replace_instance_method(method, :restore_original_method) {}
     mocha = Class.new do
       class << self
         attr_accessor :unstub_method
@@ -148,8 +149,8 @@ class AnyInstanceMethodTest < Mocha::TestCase
         self.unstub_method = method
       end
     end
-    mocha.define_instance_method(:any_expectations?) { true }
-    method.replace_instance_method(:mock) { mocha }
+    define_instance_method(mocha, :any_expectations?) { true }
+    replace_instance_method(method, :mock) { mocha }
 
     method.unstub
 
@@ -159,9 +160,9 @@ class AnyInstanceMethodTest < Mocha::TestCase
   def test_should_return_any_instance_mocha_for_stubbee
     mocha = Object.new
     any_instance = Object.new
-    any_instance.define_instance_method(:mocha) { mocha }
-    stubbee = Class.new
-    stubbee.define_instance_method(:any_instance) { any_instance }
+    define_instance_method(any_instance, :mocha) { mocha }
+    stubbee = class_with_method(:method_x)
+    define_instance_method(stubbee, :any_instance) { any_instance }
     method = AnyInstanceMethod.new(stubbee, :method_name)
     assert_equal stubbee.any_instance.mocha, method.mock
   end

data/test/unit/cardinality_test.rb

@@ -1,43 +1,61 @@
 require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/cardinality'
+require 'mocha/invocation'
+require 'mocha/return_values'
+require 'mocha/yield_parameters'
 
 class CardinalityTest < Mocha::TestCase
   include Mocha
 
+  def new_invocation
+    Invocation.new(:irrelevant, :irrelevant)
+  end
+
   def test_should_allow_invocations_if_invocation_count_has_not_yet_reached_maximum
     cardinality = Cardinality.new(2, 3)
-    assert cardinality.invocations_allowed?(0)
-    assert cardinality.invocations_allowed?(1)
-    assert cardinality.invocations_allowed?(2)
-    assert !cardinality.invocations_allowed?(3)
+    assert cardinality.invocations_allowed?
+    cardinality << new_invocation
+    assert cardinality.invocations_allowed?
+    cardinality << new_invocation
+    assert cardinality.invocations_allowed?
+    cardinality << new_invocation
+    assert !cardinality.invocations_allowed?
   end
 
   def test_should_be_satisfied_if_invocations_so_far_have_reached_required_threshold
     cardinality = Cardinality.new(2, 3)
-    assert !cardinality.satisfied?(0)
-    assert !cardinality.satisfied?(1)
-    assert cardinality.satisfied?(2)
-    assert cardinality.satisfied?(3)
+    assert !cardinality.satisfied?
+    cardinality << new_invocation
+    assert !cardinality.satisfied?
+    cardinality << new_invocation
+    assert cardinality.satisfied?
+    cardinality << new_invocation
+    assert cardinality.satisfied?
   end
 
-  def test_should_describe_cardinality
-    assert_equal 'allowed any number of times', Cardinality.at_least(0).mocha_inspect
-
-    assert_equal 'expected at most once', Cardinality.at_most(1).mocha_inspect
-    assert_equal 'expected at most twice', Cardinality.at_most(2).mocha_inspect
-    assert_equal 'expected at most 3 times', Cardinality.at_most(3).mocha_inspect
+  def test_should_describe_cardinality_defined_using_at_least
+    assert_equal 'allowed any number of times', Cardinality.at_least(0).anticipated_times
+    assert_equal 'expected at least once', Cardinality.at_least(1).anticipated_times
+    assert_equal 'expected at least twice', Cardinality.at_least(2).anticipated_times
+    assert_equal 'expected at least 3 times', Cardinality.at_least(3).anticipated_times
+  end
 
-    assert_equal 'expected at least once', Cardinality.at_least(1).mocha_inspect
-    assert_equal 'expected at least twice', Cardinality.at_least(2).mocha_inspect
-    assert_equal 'expected at least 3 times', Cardinality.at_least(3).mocha_inspect
+  def test_should_describe_cardinality_defined_using_at_most
+    assert_equal 'expected at most once', Cardinality.at_most(1).anticipated_times
+    assert_equal 'expected at most twice', Cardinality.at_most(2).anticipated_times
+    assert_equal 'expected at most 3 times', Cardinality.at_most(3).anticipated_times
+  end
 
-    assert_equal 'expected never', Cardinality.exactly(0).mocha_inspect
-    assert_equal 'expected exactly once', Cardinality.exactly(1).mocha_inspect
-    assert_equal 'expected exactly twice', Cardinality.exactly(2).mocha_inspect
-    assert_equal 'expected exactly 3 times', Cardinality.times(3).mocha_inspect
+  def test_should_describe_cardinality_defined_using_exactly
+    assert_equal 'expected never', Cardinality.exactly(0).anticipated_times
+    assert_equal 'expected exactly once', Cardinality.exactly(1).anticipated_times
+    assert_equal 'expected exactly twice', Cardinality.exactly(2).anticipated_times
+    assert_equal 'expected exactly 3 times', Cardinality.exactly(3).anticipated_times
+  end
 
-    assert_equal 'expected between 2 and 4 times', Cardinality.times(2..4).mocha_inspect
-    assert_equal 'expected between 1 and 3 times', Cardinality.times(1..3).mocha_inspect
+  def test_should_describe_cardinality_defined_using_times_with_range
+    assert_equal 'expected between 2 and 4 times', Cardinality.times(2..4).anticipated_times
+    assert_equal 'expected between 1 and 3 times', Cardinality.times(1..3).anticipated_times
   end
 
   def test_should_need_verifying

data/test/unit/central_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../../test_helper', __FILE__)
 
 require 'mocha/central'
 require 'mocha/mock'
-require 'method_definer'
 
 class CentralTest < Mocha::TestCase
   include Mocha

data/test/unit/class_methods_test.rb

@@ -51,7 +51,7 @@ class ClassMethodsTest < Mocha::TestCase
   end
 
   def test_should_use_stubba_class_method_for_class
-    assert_equal Mocha::ClassMethod, @klass.stubba_method
+    assert_equal Mocha::InstanceMethod, @klass.stubba_method
   end
 
   def test_should_use_stubba_class_method_for_any_instance

data/test/unit/configuration_test.rb

@@ -3,35 +3,35 @@ require 'mocha/configuration'
 
 class ConfigurationTest < Mocha::TestCase
   def test_allow_temporarily_changes_config_when_given_block
-    Mocha::Configuration.warn_when(:stubbing_method_unnecessarily)
+    Mocha.configure { |c| c.stubbing_method_unnecessarily = :warn }
     yielded = false
-    Mocha::Configuration.allow(:stubbing_method_unnecessarily) do
+    Mocha::Configuration.override(:stubbing_method_unnecessarily => :allow) do
       yielded = true
-      assert Mocha::Configuration.allow?(:stubbing_method_unnecessarily)
+      assert_equal :allow, Mocha.configuration.stubbing_method_unnecessarily
     end
     assert yielded
-    assert Mocha::Configuration.warn_when?(:stubbing_method_unnecessarily)
+    assert_equal :warn, Mocha.configuration.stubbing_method_unnecessarily
   end
 
   def test_prevent_temporarily_changes_config_when_given_block
-    Mocha::Configuration.allow(:stubbing_method_unnecessarily)
+    Mocha.configure { |c| c.stubbing_method_unnecessarily = :allow }
     yielded = false
-    Mocha::Configuration.prevent(:stubbing_method_unnecessarily) do
+    Mocha::Configuration.override(:stubbing_method_unnecessarily => :prevent) do
       yielded = true
-      assert Mocha::Configuration.prevent?(:stubbing_method_unnecessarily)
+      assert_equal :prevent, Mocha.configuration.stubbing_method_unnecessarily
     end
     assert yielded
-    assert Mocha::Configuration.allow?(:stubbing_method_unnecessarily)
+    assert_equal :allow, Mocha.configuration.stubbing_method_unnecessarily
   end
 
   def test_warn_when_temporarily_changes_config_when_given_block
-    Mocha::Configuration.allow(:stubbing_method_unnecessarily)
+    Mocha.configure { |c| c.stubbing_method_unnecessarily = :allow }
     yielded = false
-    Mocha::Configuration.warn_when(:stubbing_method_unnecessarily) do
+    Mocha::Configuration.override(:stubbing_method_unnecessarily => :warn) do
       yielded = true
-      assert Mocha::Configuration.warn_when?(:stubbing_method_unnecessarily)
+      assert_equal :warn, Mocha.configuration.stubbing_method_unnecessarily
     end
     assert yielded
-    assert Mocha::Configuration.allow?(:stubbing_method_unnecessarily)
+    assert_equal :allow, Mocha.configuration.stubbing_method_unnecessarily
   end
 end

data/test/unit/exception_raiser_test.rb

@@ -1,40 +1,45 @@
 require File.expand_path('../../test_helper', __FILE__)
 
+require 'mocha/invocation'
 require 'mocha/exception_raiser'
 require 'timeout'
 
 class ExceptionRaiserTest < Mocha::TestCase
   include Mocha
 
+  def new_invocation
+    Invocation.new(:irrelevant, :irrelevant)
+  end
+
   def test_should_raise_exception_with_specified_class_and_default_message
     exception_class = Class.new(StandardError)
     raiser = ExceptionRaiser.new(exception_class, nil)
-    exception = assert_raises(exception_class) { raiser.evaluate }
+    exception = assert_raises(exception_class) { raiser.evaluate(new_invocation) }
     assert_equal exception_class.to_s, exception.message
   end
 
   def test_should_raise_exception_with_specified_class_and_message
     exception_class = Class.new(StandardError)
     raiser = ExceptionRaiser.new(exception_class, 'message')
-    exception = assert_raises(exception_class) { raiser.evaluate }
+    exception = assert_raises(exception_class) { raiser.evaluate(new_invocation) }
     assert_equal 'message', exception.message
   end
 
   def test_should_raise_exception_instance
     exception_class = Class.new(StandardError)
     raiser = ExceptionRaiser.new(exception_class.new('message'), nil)
-    exception = assert_raises(exception_class) { raiser.evaluate }
+    exception = assert_raises(exception_class) { raiser.evaluate(new_invocation) }
     assert_equal 'message', exception.message
   end
 
   def test_should_raise_interrupt_exception_with_default_message_so_it_works_in_ruby_1_8_6
     raiser = ExceptionRaiser.new(Interrupt, nil)
-    assert_raises(Interrupt) { raiser.evaluate }
+    assert_raises(Interrupt) { raiser.evaluate(new_invocation) }
   end
 
   def test_should_raise_subclass_of_interrupt_exception_with_default_message_so_it_works_in_ruby_1_8_6
     exception_class = Class.new(Interrupt)
     raiser = ExceptionRaiser.new(exception_class, nil)
-    assert_raises(exception_class) { raiser.evaluate }
+    assert_raises(exception_class) { raiser.evaluate(new_invocation) }
   end
 end