mocha 1.6.0 → 1.10.1

data/test/acceptance/stubbing_error_backtrace_test.rb

@@ -1,9 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 require 'execution_point'
 
 class StubbingErrorBacktraceTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -14,10 +12,11 @@ class StubbingErrorBacktraceTest < Mocha::TestCase
     teardown_acceptance_test
   end
 
+  # rubocop:disable Style/Semicolon
   def test_should_display_backtrace_indicating_line_number_where_attempt_to_stub_non_existent_method_was_made
     execution_point = nil
     object = Object.new
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     test_result = run_as_test do
       execution_point = ExecutionPoint.current; object.stubs(:non_existent_method)
     end
@@ -31,7 +30,7 @@ class StubbingErrorBacktraceTest < Mocha::TestCase
       def non_public_method; end
       private :non_public_method
     end.new
-    Mocha::Configuration.prevent(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :prevent }
     test_result = run_as_test do
       execution_point = ExecutionPoint.current; object.stubs(:non_public_method)
     end
@@ -42,7 +41,7 @@ class StubbingErrorBacktraceTest < Mocha::TestCase
   def test_should_display_backtrace_indicating_line_number_where_attempt_to_stub_method_on_non_mock_object_was_made
     execution_point = nil
     object = Object.new
-    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
       execution_point = ExecutionPoint.current; object.stubs(:any_method)
     end
@@ -53,12 +52,12 @@ class StubbingErrorBacktraceTest < Mocha::TestCase
   def test_should_display_backtrace_indicating_line_number_where_method_was_unnecessarily_stubbed
     execution_point = nil
     object = Object.new
-    Mocha::Configuration.prevent(:stubbing_method_unnecessarily)
+    Mocha.configure { |c| c.stubbing_method_unnecessarily = :prevent }
     test_result = run_as_test do
       execution_point = ExecutionPoint.current; object.stubs(:unused_method)
     end
     assert_equal 1, test_result.error_count
     assert_equal execution_point, ExecutionPoint.new(test_result.errors[0].exception.backtrace)
   end
-
+  # rubocop:enable Style/Semicolon
 end

data/test/acceptance/stubbing_frozen_object_test.rb

@@ -1,9 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 require 'execution_point'
 
 class StubbingFrozenObjectTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -14,6 +12,7 @@ class StubbingFrozenObjectTest < Mocha::TestCase
     teardown_acceptance_test
   end
 
+  # rubocop:disable Style/Semicolon
   def test_should_fail_fast_if_attempting_to_stub_method_on_frozen_object
     object = Object.new
     object.freeze
@@ -85,4 +84,5 @@ class StubbingFrozenObjectTest < Mocha::TestCase
     assert_equal 1, test_result.error_count
     assert_equal execution_point, ExecutionPoint.new(test_result.errors[0].exception.backtrace)
   end
+  # rubocop:enable Style/Semicolon
 end

data/test/acceptance/stubbing_method_accepting_block_parameter_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class StubbingMethodAcceptingBlockParameterTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -15,34 +13,40 @@ class StubbingMethodAcceptingBlockParameterTest < Mocha::TestCase
 
   def test_stubbing_class_method_accepting_block_parameter_should_restore_original_method
     klass = Class.new do
-      def self.my_class_method(&block); block.call; end
+      def self.my_class_method(&block)
+        block.call
+      end
     end
     test_result = run_as_test do
       klass.stubs(:my_class_method)
     end
     assert_passed(test_result)
-    assert_equal :return_value, klass.my_class_method { :return_value }
+    assert_equal :return_value, (klass.my_class_method { :return_value })
   end
 
   def test_stubbing_instance_method_accepting_block_parameter_should_restore_original_method
     instance = Class.new do
-      def my_instance_method(&block); block.call; end
+      def my_instance_method
+        yield
+      end
     end.new
     test_result = run_as_test do
       instance.stubs(:my_instance_method)
     end
     assert_passed(test_result)
-    assert_equal :return_value, instance.my_instance_method { :return_value }
+    assert_equal :return_value, (instance.my_instance_method { :return_value })
   end
 
   def test_stubbing_any_instance_method_accepting_block_parameter_should_restore_original_method
     klass = Class.new do
-      def my_instance_method(&block); block.call; end
+      def my_instance_method
+        yield
+      end
     end
     test_result = run_as_test do
       klass.any_instance.stubs(:my_instance_method)
     end
     assert_passed(test_result)
-    assert_equal :return_value, klass.new.my_instance_method { :return_value }
+    assert_equal :return_value, (klass.new.my_instance_method { :return_value })
   end
 end

data/test/acceptance/stubbing_method_unnecessarily_test.rb

@@ -1,8 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 
 class StubbingMethodUnnecessarilyTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -14,7 +13,7 @@ class StubbingMethodUnnecessarilyTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_method_unnecessarily
-    Mocha::Configuration.allow(:stubbing_method_unnecessarily)
+    Mocha.configure { |c| c.stubbing_method_unnecessarily = :allow }
     test_result = run_as_test do
       mock = mock('mock')
       mock.stubs(:public_method)
@@ -24,7 +23,7 @@ class StubbingMethodUnnecessarilyTest < Mocha::TestCase
   end
 
   def test_should_warn_when_stubbing_method_unnecessarily
-    Mocha::Configuration.warn_when(:stubbing_method_unnecessarily)
+    Mocha.configure { |c| c.stubbing_method_unnecessarily = :warn }
     test_result = run_as_test do
       mock = mock('mock')
       mock.stubs(:public_method)
@@ -34,7 +33,7 @@ class StubbingMethodUnnecessarilyTest < Mocha::TestCase
   end
 
   def test_should_prevent_stubbing_method_unnecessarily
-    Mocha::Configuration.prevent(:stubbing_method_unnecessarily)
+    Mocha.configure { |c| c.stubbing_method_unnecessarily = :prevent }
     test_result = run_as_test do
       mock = mock('mock')
       mock.stubs(:public_method)
@@ -53,7 +52,7 @@ class StubbingMethodUnnecessarilyTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_method_when_stubbed_method_is_invoked
-    Mocha::Configuration.prevent(:stubbing_method_unnecessarily)
+    Mocha.configure { |c| c.stubbing_method_unnecessarily = :prevent }
     test_result = run_as_test do
       mock = mock('mock')
       mock.stubs(:public_method)
@@ -61,5 +60,4 @@ class StubbingMethodUnnecessarilyTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
 end

data/test/acceptance/stubbing_nil_test.rb

@@ -1,8 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 
 class StubbingNilTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -15,30 +14,30 @@ class StubbingNilTest < Mocha::TestCase
 
   if RUBY_VERSION < '2.2.0'
     def test_should_allow_stubbing_method_on_nil
-      Mocha::Configuration.allow(:stubbing_method_on_nil)
+      Mocha.configure { |c| c.stubbing_method_on_nil = :allow }
       test_result = run_as_test do
         nil.stubs(:stubbed_method)
       end
       assert_passed(test_result)
-      assert !@logger.warnings.include?("stubbing method on nil: nil.stubbed_method")
+      assert !@logger.warnings.include?('stubbing method on nil: nil.stubbed_method')
     end
 
     def test_should_warn_on_stubbing_method_on_nil
-      Mocha::Configuration.warn_when(:stubbing_method_on_nil)
+      Mocha.configure { |c| c.stubbing_method_on_nil = :warn }
       test_result = run_as_test do
         nil.stubs(:stubbed_method)
       end
       assert_passed(test_result)
-      assert @logger.warnings.include?("stubbing method on nil: nil.stubbed_method")
+      assert @logger.warnings.include?('stubbing method on nil: nil.stubbed_method')
     end
 
     def test_should_prevent_stubbing_method_on_nil
-      Mocha::Configuration.prevent(:stubbing_method_on_nil)
+      Mocha.configure { |c| c.stubbing_method_on_nil = :prevent }
       test_result = run_as_test do
         nil.stubs(:stubbed_method)
       end
       assert_failed(test_result)
-      assert test_result.error_messages.include?("Mocha::StubbingError: stubbing method on nil: nil.stubbed_method")
+      assert test_result.error_messages.include?('Mocha::StubbingError: stubbing method on nil: nil.stubbed_method')
     end
 
     def test_should_default_to_prevent_stubbing_method_on_non_mock_object
@@ -46,11 +45,11 @@ class StubbingNilTest < Mocha::TestCase
         nil.stubs(:stubbed_method)
       end
       assert_failed(test_result)
-      assert test_result.error_messages.include?("Mocha::StubbingError: stubbing method on nil: nil.stubbed_method")
+      assert test_result.error_messages.include?('Mocha::StubbingError: stubbing method on nil: nil.stubbed_method')
     end
 
     def test_should_allow_stubbing_method_on_non_nil_object
-      Mocha::Configuration.prevent(:stubbing_method_on_nil)
+      Mocha.configure { |c| c.stubbing_method_on_nil = :prevent }
       object = Object.new
       test_result = run_as_test do
         object.stubs(:stubbed_method)

data/test/acceptance/stubbing_non_existent_any_instance_method_test.rb

@@ -1,8 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 
 class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -14,7 +13,7 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_non_existent_any_instance_method
-    Mocha::Configuration.allow(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :allow }
     klass = Class.new
     test_result = run_as_test do
       klass.any_instance.stubs(:non_existent_method)
@@ -24,7 +23,7 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_warn_when_stubbing_non_existent_any_instance_method
-    Mocha::Configuration.warn_when(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :warn }
     klass = Class.new
     test_result = run_as_test do
       klass.any_instance.stubs(:non_existent_method)
@@ -34,7 +33,7 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_prevent_stubbing_non_existent_any_instance_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new
     test_result = run_as_test do
       klass.any_instance.stubs(:non_existent_method)
@@ -53,7 +52,7 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_public_any_instance_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do
       def existing_public_method; end
       public :existing_public_method
@@ -65,9 +64,9 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_method_to_which_any_instance_responds
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do
-      def respond_to?(method, include_private = false)
+      def respond_to?(method, _include_private = false)
         (method == :method_to_which_instance_responds)
       end
     end
@@ -77,8 +76,24 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
     assert_passed(test_result)
   end
 
+  def test_should_default_to_allowing_stubbing_method_if_responds_to_depends_on_calling_initialize
+    klass = Class.new do
+      def initialize(attrs = {})
+        @attributes = attrs
+      end
+
+      def respond_to?(method, _include_private = false)
+        @attributes.key?(method) ? @attributes[method] : super
+      end
+    end
+    test_result = run_as_test do
+      klass.any_instance.stubs(:foo)
+    end
+    assert_passed(test_result)
+  end
+
   def test_should_allow_stubbing_existing_protected_any_instance_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do
       def existing_protected_method; end
       protected :existing_protected_method
@@ -90,7 +105,7 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_private_any_instance_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do
       def existing_private_method; end
       private :existing_private_method
@@ -102,7 +117,7 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_public_any_instance_superclass_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     superklass = Class.new do
       def existing_public_method; end
       public :existing_public_method
@@ -115,7 +130,7 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_protected_any_instance_superclass_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     superklass = Class.new do
       def existing_protected_method; end
       protected :existing_protected_method
@@ -128,7 +143,7 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_private_any_instance_superclass_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     superklass = Class.new do
       def existing_private_method; end
       private :existing_private_method
@@ -139,5 +154,4 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
 end

data/test/acceptance/stubbing_non_existent_class_method_test.rb

@@ -1,8 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 
 class StubbingNonExistentClassMethodTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -14,7 +13,7 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_non_existent_class_method
-    Mocha::Configuration.allow(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :allow }
     klass = Class.new
     test_result = run_as_test do
       klass.stubs(:non_existent_method)
@@ -24,7 +23,7 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
   end
 
   def test_should_warn_when_stubbing_non_existent_class_method
-    Mocha::Configuration.warn_when(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :warn }
     klass = Class.new
     test_result = run_as_test do
       klass.stubs(:non_existent_method)
@@ -34,7 +33,7 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
   end
 
   def test_should_prevent_stubbing_non_existent_class_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new
     test_result = run_as_test do
       klass.stubs(:non_existent_method)
@@ -52,8 +51,9 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
     assert_passed(test_result)
   end
 
+  # rubocop:disable Lint/DuplicateMethods
   def test_should_allow_stubbing_existing_public_class_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do
       class << self
         def existing_public_method; end
@@ -67,10 +67,10 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_method_to_which_class_responds
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do
       class << self
-        def respond_to?(method, include_private = false)
+        def respond_to?(method, _include_private = false)
           (method == :method_to_which_class_responds)
         end
       end
@@ -82,7 +82,7 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_protected_class_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do
       class << self
         def existing_protected_method; end
@@ -96,7 +96,7 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_private_class_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do
       class << self
         def existing_private_method; end
@@ -110,7 +110,7 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_public_superclass_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     superklass = Class.new do
       class << self
         def existing_public_method; end
@@ -125,7 +125,7 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_protected_superclass_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     superklass = Class.new do
       class << self
         def existing_protected_method; end
@@ -140,7 +140,7 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_private_superclass_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     superklass = Class.new do
       class << self
         def existing_private_method; end
@@ -153,5 +153,5 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
+  # rubocop:enable Lint/DuplicateMethods
 end