mocha 1.7.0 → 1.10.2

data/test/acceptance/stubbing_non_public_any_instance_method_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 
 class StubbingNonPublicAnyInstanceMethodTest < Mocha::TestCase
   include AcceptanceTest
@@ -13,7 +13,7 @@ class StubbingNonPublicAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_private_any_instance_method
-    Mocha::Configuration.allow(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :allow }
     klass = Class.new do
       def private_method; end
       private :private_method
@@ -26,7 +26,7 @@ class StubbingNonPublicAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_protected_any_instance_method
-    Mocha::Configuration.allow(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :allow }
     klass = Class.new do
       def protected_method; end
       protected :protected_method
@@ -39,7 +39,7 @@ class StubbingNonPublicAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_warn_when_stubbing_private_any_instance_method
-    Mocha::Configuration.warn_when(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :warn }
     klass = Class.new do
       def private_method; end
       private :private_method
@@ -52,7 +52,7 @@ class StubbingNonPublicAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_warn_when_stubbing_protected_any_instance_method
-    Mocha::Configuration.warn_when(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :warn }
     klass = Class.new do
       def protected_method; end
       protected :protected_method
@@ -65,7 +65,7 @@ class StubbingNonPublicAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_prevent_stubbing_private_any_instance_method
-    Mocha::Configuration.prevent(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :prevent }
     klass = Class.new do
       def private_method; end
       private :private_method
@@ -78,7 +78,7 @@ class StubbingNonPublicAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_prevent_stubbing_protected_any_instance_method
-    Mocha::Configuration.prevent(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :prevent }
     klass = Class.new do
       def protected_method; end
       protected :protected_method
@@ -115,7 +115,7 @@ class StubbingNonPublicAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_public_any_instance_method
-    Mocha::Configuration.prevent(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :prevent }
     klass = Class.new do
       def public_method; end
       public :public_method

data/test/acceptance/stubbing_non_public_class_method_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 
 class StubbingNonPublicClassMethodTest < Mocha::TestCase
   include AcceptanceTest
@@ -14,7 +14,7 @@ class StubbingNonPublicClassMethodTest < Mocha::TestCase
 
   # rubocop:disable Lint/DuplicateMethods
   def test_should_allow_stubbing_private_class_method
-    Mocha::Configuration.allow(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :allow }
     klass = Class.new do
       class << self
         def private_method; end
@@ -29,7 +29,7 @@ class StubbingNonPublicClassMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_protected_class_method
-    Mocha::Configuration.allow(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :allow }
     klass = Class.new do
       class << self
         def protected_method; end
@@ -44,7 +44,7 @@ class StubbingNonPublicClassMethodTest < Mocha::TestCase
   end
 
   def test_should_warn_when_stubbing_private_class_method
-    Mocha::Configuration.warn_when(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :warn }
     klass = Class.new do
       class << self
         def private_method; end
@@ -59,7 +59,7 @@ class StubbingNonPublicClassMethodTest < Mocha::TestCase
   end
 
   def test_should_warn_when_stubbing_protected_class_method
-    Mocha::Configuration.warn_when(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :warn }
     klass = Class.new do
       class << self
         def protected_method; end
@@ -74,7 +74,7 @@ class StubbingNonPublicClassMethodTest < Mocha::TestCase
   end
 
   def test_should_prevent_stubbing_private_class_method
-    Mocha::Configuration.prevent(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :prevent }
     klass = Class.new do
       class << self
         def private_method; end
@@ -89,7 +89,7 @@ class StubbingNonPublicClassMethodTest < Mocha::TestCase
   end
 
   def test_should_prevent_stubbing_protected_class_method
-    Mocha::Configuration.prevent(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :prevent }
     klass = Class.new do
       class << self
         def protected_method; end
@@ -132,7 +132,7 @@ class StubbingNonPublicClassMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_public_class_method
-    Mocha::Configuration.prevent(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :prevent }
     klass = Class.new do
       class << self
         def public_method; end
@@ -147,7 +147,7 @@ class StubbingNonPublicClassMethodTest < Mocha::TestCase
   # rubocop:enable Lint/DuplicateMethods
 
   def test_should_allow_stubbing_method_to_which_class_responds
-    Mocha::Configuration.prevent(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :prevent }
     klass = Class.new do
       class << self
         def respond_to?(method, _include_private_methods = false)

data/test/acceptance/stubbing_non_public_instance_method_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 
 class StubbingNonPublicInstanceMethodTest < Mocha::TestCase
   include AcceptanceTest
@@ -13,7 +13,7 @@ class StubbingNonPublicInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_private_instance_method
-    Mocha::Configuration.allow(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :allow }
     instance = Class.new do
       def private_method; end
       private :private_method
@@ -26,7 +26,7 @@ class StubbingNonPublicInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_protected_instance_method
-    Mocha::Configuration.allow(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :allow }
     instance = Class.new do
       def protected_method; end
       protected :protected_method
@@ -39,7 +39,7 @@ class StubbingNonPublicInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_warn_when_stubbing_private_instance_method
-    Mocha::Configuration.warn_when(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :warn }
     instance = Class.new do
       def private_method; end
       private :private_method
@@ -52,7 +52,7 @@ class StubbingNonPublicInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_warn_when_stubbing_protected_instance_method
-    Mocha::Configuration.warn_when(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :warn }
     instance = Class.new do
       def protected_method; end
       protected :protected_method
@@ -65,7 +65,7 @@ class StubbingNonPublicInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_prevent_stubbing_private_instance_method
-    Mocha::Configuration.prevent(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :prevent }
     instance = Class.new do
       def private_method; end
       private :private_method
@@ -78,7 +78,7 @@ class StubbingNonPublicInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_prevent_stubbing_protected_instance_method
-    Mocha::Configuration.prevent(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :prevent }
     instance = Class.new do
       def protected_method; end
       protected :protected_method
@@ -115,7 +115,7 @@ class StubbingNonPublicInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_public_instance_method
-    Mocha::Configuration.prevent(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :prevent }
     instance = Class.new do
       def public_method; end
       public :public_method
@@ -127,7 +127,7 @@ class StubbingNonPublicInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_method_to_which_instance_responds
-    Mocha::Configuration.prevent(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :prevent }
     instance = Class.new do
       def respond_to?(method, _include_private_methods = false)
         (method == :method_to_which_instance_responds)

data/test/acceptance/stubbing_on_non_mock_object_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 
 class StubbingOnNonMockObjectTest < Mocha::TestCase
   include AcceptanceTest
@@ -13,7 +13,7 @@ class StubbingOnNonMockObjectTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_method_on_non_mock_object
-    Mocha::Configuration.allow(:stubbing_method_on_non_mock_object)
+    Mocha.configure { |c| c.stubbing_method_on_non_mock_object = :allow }
     non_mock_object = Class.new do
       def existing_method; end
     end
@@ -25,7 +25,7 @@ class StubbingOnNonMockObjectTest < Mocha::TestCase
   end
 
   def test_should_warn_on_stubbing_method_on_non_mock_object
-    Mocha::Configuration.warn_when(:stubbing_method_on_non_mock_object)
+    Mocha.configure { |c| c.stubbing_method_on_non_mock_object = :warn }
     non_mock_object = Class.new do
       def existing_method; end
     end
@@ -37,7 +37,7 @@ class StubbingOnNonMockObjectTest < Mocha::TestCase
   end
 
   def test_should_prevent_stubbing_method_on_non_mock_object
-    Mocha::Configuration.prevent(:stubbing_method_on_non_mock_object)
+    Mocha.configure { |c| c.stubbing_method_on_non_mock_object = :prevent }
     non_mock_object = Class.new do
       def existing_method; end
     end
@@ -60,7 +60,7 @@ class StubbingOnNonMockObjectTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_method_on_mock_object
-    Mocha::Configuration.prevent(:stubbing_method_on_non_mock_object)
+    Mocha.configure { |c| c.stubbing_method_on_non_mock_object = :prevent }
     test_result = run_as_test do
       mock = mock('mock')
       mock.stubs(:any_method)

data/test/acceptance/stubbing_same_class_method_on_parent_and_child_classes_test.rb

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

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
@@ -43,12 +52,32 @@ class AnyInstanceMethodTest < Mocha::TestCase
     assert mocha.__verified__?
   end
 
-  def test_should_restore_original_method
-    klass = Class.new do
-      def method_x
-        :original_result
-      end
+  def test_should_include_the_filename_and_line_number_in_exceptions
+    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
+    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 = 'stubbed_method.rb'
+    expected_line_number = 61
+
+    exception = assert_raises(Exception) { klass.new.method_x }
+    matching_line = exception.backtrace.find do |line|
+      filename, line_number, _context = line.split(':')
+      filename.include?(expected_filename) && line_number.to_i == expected_line_number
     end
+
+    assert_not_nil matching_line, "Expected to find #{expected_filename}:#{expected_line_number} in the backtrace:\n #{exception.backtrace.join("\n")}"
+  end
+
+  def test_should_restore_original_method
+    klass = class_with_method(:method_x, :original_result)
     method = AnyInstanceMethod.new(klass, :method_x)
 
     method.hide_original_method
@@ -62,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
@@ -76,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
 
@@ -93,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
 
@@ -110,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
@@ -124,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
 
@@ -135,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