RubyGems - mocha - Versions diffs - 1.6.0 → 1.10.1 - Mend

mocha 1.6.0 → 1.10.1

Files changed (310) hide show

checksums.yaml +5 -5
data/.rubocop.yml +61 -0
data/.rubocop_todo.yml +27 -0
data/CONTRIBUTING.md +4 -9
data/README.md +55 -27
data/RELEASE.md +90 -0
data/Rakefile +44 -38
data/bin/build-matrix +32 -20
data/docs/CNAME +1 -0
data/docs/Mocha.html +254 -0
data/docs/Mocha/API.html +1153 -0
data/docs/Mocha/ClassMethods.html +264 -0
data/docs/Mocha/Configuration.html +1383 -0
data/docs/Mocha/Expectation.html +2654 -0
data/docs/Mocha/ExpectationError.html +152 -0
data/docs/Mocha/ExpectationErrorFactory.html +260 -0
data/docs/Mocha/Hooks.html +370 -0
data/docs/Mocha/Integration.html +125 -0
data/docs/Mocha/Integration/MiniTest.html +123 -0
data/docs/Mocha/Integration/MiniTest/Adapter.html +164 -0
data/docs/Mocha/Integration/TestUnit.html +123 -0
data/docs/Mocha/Integration/TestUnit/Adapter.html +164 -0
data/docs/Mocha/Mock.html +1237 -0
data/docs/Mocha/ObjectMethods.html +765 -0
data/docs/Mocha/ParameterMatchers.html +2961 -0
data/docs/Mocha/ParameterMatchers/AllOf.html +153 -0
data/docs/Mocha/ParameterMatchers/AnyOf.html +153 -0
data/docs/Mocha/ParameterMatchers/AnyParameters.html +153 -0
data/docs/Mocha/ParameterMatchers/Anything.html +153 -0
data/docs/Mocha/ParameterMatchers/Base.html +441 -0
data/docs/Mocha/ParameterMatchers/Equals.html +153 -0
data/docs/Mocha/ParameterMatchers/EquivalentUri.html +153 -0
data/docs/Mocha/ParameterMatchers/HasEntries.html +153 -0
data/docs/Mocha/ParameterMatchers/HasEntry.html +153 -0
data/docs/Mocha/ParameterMatchers/HasKey.html +153 -0
data/docs/Mocha/ParameterMatchers/HasValue.html +153 -0
data/docs/Mocha/ParameterMatchers/Includes.html +153 -0
data/docs/Mocha/ParameterMatchers/InstanceOf.html +153 -0
data/docs/Mocha/ParameterMatchers/IsA.html +153 -0
data/docs/Mocha/ParameterMatchers/KindOf.html +153 -0
data/docs/Mocha/ParameterMatchers/Not.html +153 -0
data/docs/Mocha/ParameterMatchers/Optionally.html +153 -0
data/docs/Mocha/ParameterMatchers/RegexpMatches.html +153 -0
data/docs/Mocha/ParameterMatchers/RespondsWith.html +153 -0
data/docs/Mocha/ParameterMatchers/YamlEquivalent.html +153 -0
data/docs/Mocha/Sequence.html +149 -0
data/docs/Mocha/StateMachine.html +527 -0
data/docs/Mocha/StateMachine/State.html +140 -0
data/docs/Mocha/StateMachine/StatePredicate.html +140 -0
data/docs/Mocha/StubbingError.html +150 -0
data/docs/_index.html +519 -0
data/docs/class_list.html +51 -0
data/docs/css/common.css +1 -0
data/docs/css/full_list.css +58 -0
data/docs/css/style.css +496 -0
data/docs/file.COPYING.html +81 -0
data/docs/file.MIT-LICENSE.html +85 -0
data/docs/file.README.html +448 -0
data/docs/file.RELEASE.html +963 -0
data/docs/file_list.html +71 -0
data/docs/frames.html +17 -0
data/docs/index.html +448 -0
data/docs/js/app.js +303 -0
data/docs/js/full_list.js +216 -0
data/docs/js/jquery.js +4 -0
data/docs/method_list.html +627 -0
data/docs/top-level-namespace.html +118 -0
data/gemfiles/Gemfile.minitest.5.11.3 +7 -0
data/init.rb +1 -3
data/lib/mocha.rb +8 -0
data/lib/mocha/any_instance_method.rb +11 -59
data/lib/mocha/api.rb +70 -70
data/lib/mocha/argument_iterator.rb +4 -8
data/lib/mocha/backtrace_filter.rb +1 -5
data/lib/mocha/cardinality.rb +43 -35
data/lib/mocha/central.rb +7 -15
data/lib/mocha/change_state_side_effect.rb +0 -4
data/lib/mocha/class_methods.rb +13 -19
data/lib/mocha/configuration.rb +296 -74
data/lib/mocha/debug.rb +3 -2
data/lib/mocha/deprecation.rb +4 -11
data/lib/mocha/detection/mini_test.rb +0 -2
data/lib/mocha/detection/test_unit.rb +3 -5
data/lib/mocha/error_with_filtered_backtrace.rb +0 -4
data/lib/mocha/exception_raiser.rb +4 -6
data/lib/mocha/expectation.rb +62 -67
data/lib/mocha/expectation_error.rb +1 -1
data/lib/mocha/expectation_error_factory.rb +0 -1
data/lib/mocha/expectation_list.rb +7 -11
data/lib/mocha/hooks.rb +0 -1
data/lib/mocha/in_state_ordering_constraint.rb +0 -4
data/lib/mocha/inspect.rb +28 -28
data/lib/mocha/instance_method.rb +18 -3
data/lib/mocha/integration.rb +2 -5
data/lib/mocha/integration/mini_test.rb +7 -0
data/lib/mocha/integration/mini_test/adapter.rb +2 -4
data/lib/mocha/integration/mini_test/exception_translation.rb +1 -1
data/lib/mocha/integration/mini_test/nothing.rb +4 -4
data/lib/mocha/integration/mini_test/version_13.rb +3 -1
data/lib/mocha/integration/mini_test/version_140.rb +3 -1
data/lib/mocha/integration/mini_test/version_141.rb +3 -1
data/lib/mocha/integration/mini_test/version_142_to_172.rb +3 -1
data/lib/mocha/integration/mini_test/version_200.rb +3 -1
data/lib/mocha/integration/mini_test/version_201_to_222.rb +3 -1
data/lib/mocha/integration/mini_test/version_2110_to_2111.rb +3 -1
data/lib/mocha/integration/mini_test/version_2112_to_320.rb +3 -1
data/lib/mocha/integration/mini_test/version_230_to_2101.rb +3 -1
data/lib/mocha/integration/monkey_patcher.rb +5 -7
data/lib/mocha/integration/test_unit.rb +7 -0
data/lib/mocha/integration/test_unit/adapter.rb +5 -6
data/lib/mocha/integration/test_unit/gem_version_200.rb +4 -2
data/lib/mocha/integration/test_unit/gem_version_201_to_202.rb +4 -2
data/lib/mocha/integration/test_unit/gem_version_203_to_220.rb +4 -2
data/lib/mocha/integration/test_unit/gem_version_230_to_250.rb +4 -2
data/lib/mocha/integration/test_unit/nothing.rb +4 -4
data/lib/mocha/integration/test_unit/ruby_version_185_and_below.rb +3 -1
data/lib/mocha/integration/test_unit/ruby_version_186_and_above.rb +3 -1
data/lib/mocha/invocation.rb +61 -0
data/lib/mocha/is_a.rb +0 -2
data/lib/mocha/logger.rb +0 -4
data/lib/mocha/macos_version.rb +5 -0
data/lib/mocha/method_matcher.rb +1 -5
data/lib/mocha/minitest.rb +7 -2
data/lib/mocha/mock.rb +57 -47
data/lib/mocha/mockery.rb +38 -90
data/lib/mocha/multiple_yields.rb +0 -5
data/lib/mocha/names.rb +2 -12
data/lib/mocha/no_yields.rb +1 -7
data/lib/mocha/not_initialized_error.rb +0 -2
data/lib/mocha/object_methods.rb +19 -29
data/lib/mocha/parameter_matchers.rb +1 -3
data/lib/mocha/parameter_matchers/all_of.rb +2 -8
data/lib/mocha/parameter_matchers/any_of.rb +2 -8
data/lib/mocha/parameter_matchers/any_parameters.rb +3 -9
data/lib/mocha/parameter_matchers/anything.rb +2 -8
data/lib/mocha/parameter_matchers/base.rb +6 -12
data/lib/mocha/parameter_matchers/equals.rb +0 -6
data/lib/mocha/parameter_matchers/equivalent_uri.rb +3 -12
data/lib/mocha/parameter_matchers/has_entries.rb +2 -6
data/lib/mocha/parameter_matchers/has_entry.rb +8 -11
data/lib/mocha/parameter_matchers/has_key.rb +2 -6
data/lib/mocha/parameter_matchers/has_value.rb +2 -6
data/lib/mocha/parameter_matchers/includes.rb +4 -6
data/lib/mocha/parameter_matchers/instance_methods.rb +18 -0
data/lib/mocha/parameter_matchers/instance_of.rb +0 -6
data/lib/mocha/parameter_matchers/is_a.rb +2 -6
data/lib/mocha/parameter_matchers/kind_of.rb +2 -6
data/lib/mocha/parameter_matchers/not.rb +2 -6
data/lib/mocha/parameter_matchers/optionally.rb +4 -10
data/lib/mocha/parameter_matchers/regexp_matches.rb +0 -6
data/lib/mocha/parameter_matchers/responds_with.rb +3 -8
data/lib/mocha/parameter_matchers/yaml_equivalent.rb +2 -6
data/lib/mocha/parameters_matcher.rb +6 -9
data/lib/mocha/pretty_parameters.rb +0 -4
data/lib/mocha/raised_exception.rb +11 -0
data/lib/mocha/receivers.rb +6 -12
data/lib/mocha/return_values.rb +4 -8
data/lib/mocha/sequence.rb +4 -9
data/lib/mocha/setup.rb +5 -0
data/lib/mocha/single_return_value.rb +2 -5
data/lib/mocha/single_yield.rb +0 -5
data/lib/mocha/singleton_class.rb +9 -0
data/lib/mocha/state_machine.rb +6 -10
data/lib/mocha/stubbed_method.rb +127 -0
data/lib/mocha/stubbing_error.rb +0 -2
data/lib/mocha/test_unit.rb +7 -2
data/lib/mocha/thrower.rb +4 -6
data/lib/mocha/thrown_object.rb +12 -0
data/lib/mocha/version.rb +1 -1
data/lib/mocha/yield_parameters.rb +3 -7
data/mocha.gemspec +33 -60
data/test/acceptance/acceptance_test_helper.rb +6 -4
data/test/acceptance/bug_18914_test.rb +7 -13
data/test/acceptance/bug_21465_test.rb +0 -3
data/test/acceptance/bug_21563_test.rb +0 -3
data/test/acceptance/display_matching_invocations_alongside_expectations_test.rb +69 -0
data/test/acceptance/exception_rescue_test.rb +7 -9
data/test/acceptance/expectations_on_multiple_methods_test.rb +2 -2
data/test/acceptance/expected_invocation_count_test.rb +27 -30
data/test/acceptance/failure_messages_test.rb +3 -6
data/test/acceptance/issue_272_test.rb +1 -3
data/test/acceptance/issue_65_test.rb +15 -14
data/test/acceptance/issue_70_test.rb +0 -2
data/test/acceptance/mocha_example_test.rb +5 -7
data/test/acceptance/mocha_test_result_test.rb +7 -8
data/test/acceptance/mock_test.rb +48 -9
data/test/acceptance/mocked_methods_dispatch_test.rb +0 -3
data/test/acceptance/multiple_expectations_failure_message_test.rb +16 -18
data/test/acceptance/optional_parameters_test.rb +0 -3
data/test/acceptance/parameter_matcher_test.rb +2 -4
data/test/acceptance/partial_mocks_test.rb +4 -7
data/test/acceptance/prepend_test.rb +14 -17
data/test/acceptance/prevent_use_of_mocha_outside_test_test.rb +0 -3
data/test/acceptance/raise_exception_test.rb +2 -5
data/test/acceptance/return_value_test.rb +0 -3
data/test/acceptance/sequence_test.rb +9 -12
data/test/acceptance/states_test.rb +6 -5
data/test/acceptance/stub_any_instance_method_defined_on_superclass_test.rb +5 -5
data/test/acceptance/stub_any_instance_method_test.rb +39 -18
data/test/acceptance/stub_class_method_defined_on_active_record_association_proxy_test.rb +8 -9
data/test/acceptance/stub_class_method_defined_on_class_test.rb +2 -2
data/test/acceptance/stub_class_method_defined_on_module_test.rb +0 -2
data/test/acceptance/stub_class_method_defined_on_superclass_test.rb +7 -5
data/test/acceptance/stub_everything_test.rb +1 -4
data/test/acceptance/stub_instance_method_defined_on_active_record_association_proxy_test.rb +6 -8
data/test/acceptance/stub_instance_method_defined_on_class_and_aliased_test.rb +0 -2
data/test/acceptance/stub_instance_method_defined_on_class_test.rb +0 -2
data/test/acceptance/stub_instance_method_defined_on_kernel_module_test.rb +0 -2
data/test/acceptance/stub_instance_method_defined_on_module_test.rb +0 -2
data/test/acceptance/stub_instance_method_defined_on_object_class_test.rb +2 -2
data/test/acceptance/stub_instance_method_defined_on_singleton_class_test.rb +0 -3
data/test/acceptance/stub_instance_method_defined_on_superclass_test.rb +0 -2
data/test/acceptance/stub_method_defined_on_module_and_aliased_test.rb +0 -1
data/test/acceptance/stub_module_method_test.rb +13 -14
data/test/acceptance/stub_test.rb +1 -4
data/test/acceptance/stubba_example_test.rb +6 -15
data/test/acceptance/stubba_test_result_test.rb +5 -9
data/test/acceptance/stubbing_error_backtrace_test.rb +6 -7
data/test/acceptance/stubbing_frozen_object_test.rb +2 -2
data/test/acceptance/stubbing_method_accepting_block_parameter_test.rb +12 -8
data/test/acceptance/stubbing_method_unnecessarily_test.rb +5 -7
data/test/acceptance/stubbing_nil_test.rb +9 -10
data/test/acceptance/stubbing_non_existent_any_instance_method_test.rb +28 -14
data/test/acceptance/stubbing_non_existent_class_method_test.rb +14 -14
data/test/acceptance/stubbing_non_existent_instance_method_test.rb +12 -14
data/test/acceptance/stubbing_non_public_any_instance_method_test.rb +8 -10
data/test/acceptance/stubbing_non_public_class_method_test.rb +12 -12
data/test/acceptance/stubbing_non_public_instance_method_test.rb +10 -12
data/test/acceptance/stubbing_on_non_mock_object_test.rb +9 -15
data/test/acceptance/stubbing_same_class_method_on_parent_and_child_classes_test.rb +3 -5
data/test/acceptance/throw_test.rb +0 -3
data/test/acceptance/unexpected_invocation_test.rb +2 -4
data/test/acceptance/unstubbing_test.rb +41 -15
data/test/deprecation_disabler.rb +0 -1
data/test/execution_point.rb +2 -4
data/test/integration/mini_test_test.rb +2 -2
data/test/integration/shared_tests.rb +27 -23
data/test/integration/test_unit_test.rb +2 -2
data/test/method_definer.rb +11 -19
data/test/mini_test_result.rb +17 -11
data/test/minitest_result.rb +0 -1
data/test/simple_counter.rb +0 -2
data/test/test_helper.rb +13 -5
data/test/test_runner.rb +4 -4
data/test/test_unit_result.rb +4 -2
data/test/unit/any_instance_method_test.rb +74 -35
data/test/unit/array_inspect_test.rb +2 -4
data/test/unit/backtrace_filter_test.rb +3 -5
data/test/unit/cardinality_test.rb +41 -25
data/test/unit/central_test.rb +26 -28
data/test/unit/change_state_side_effect_test.rb +0 -4
data/test/unit/class_methods_test.rb +10 -12
data/test/unit/configuration_test.rb +13 -14
data/test/unit/date_time_inspect_test.rb +1 -3
data/test/unit/exception_raiser_test.rb +10 -7
data/test/unit/expectation_list_test.rb +13 -13
data/test/unit/expectation_test.rb +110 -130
data/test/unit/hash_inspect_test.rb +3 -5
data/test/unit/hooks_test.rb +9 -4
data/test/unit/in_state_ordering_constraint_test.rb +0 -4
data/test/unit/instance_method_test.rb +282 -0
data/test/unit/method_matcher_test.rb +1 -3
data/test/unit/mock_test.rb +47 -25
data/test/unit/mockery_test.rb +32 -33
data/test/unit/module_methods_test.rb +2 -5
data/test/unit/multiple_yields_test.rb +0 -2
data/test/unit/no_yields_test.rb +0 -2
data/test/unit/object_inspect_test.rb +26 -5
data/test/unit/object_methods_test.rb +9 -10
data/test/unit/parameter_matchers/all_of_test.rb +0 -2
data/test/unit/parameter_matchers/any_of_test.rb +0 -2
data/test/unit/parameter_matchers/anything_test.rb +2 -4
data/test/unit/parameter_matchers/equals_test.rb +1 -3
data/test/unit/parameter_matchers/equivalent_uri_test.rb +0 -10
data/test/unit/parameter_matchers/has_entries_test.rb +3 -3
data/test/unit/parameter_matchers/has_entry_test.rb +14 -15
data/test/unit/parameter_matchers/has_key_test.rb +1 -2
data/test/unit/parameter_matchers/has_value_test.rb +1 -3
data/test/unit/parameter_matchers/includes_test.rb +9 -10
data/test/unit/parameter_matchers/instance_of_test.rb +1 -3
data/test/unit/parameter_matchers/is_a_test.rb +1 -3
data/test/unit/parameter_matchers/kind_of_test.rb +1 -3
data/test/unit/parameter_matchers/not_test.rb +0 -2
data/test/unit/parameter_matchers/regexp_matches_test.rb +1 -2
data/test/unit/parameter_matchers/responds_with_test.rb +10 -4
data/test/unit/parameter_matchers/stub_matcher.rb +0 -4
data/test/unit/parameter_matchers/yaml_equivalent_test.rb +1 -3
data/test/unit/parameters_matcher_test.rb +2 -4
data/test/unit/receivers_test.rb +8 -6
data/test/unit/return_values_test.rb +28 -25
data/test/unit/sequence_test.rb +1 -5
data/test/unit/single_return_value_test.rb +6 -3
data/test/unit/single_yield_test.rb +0 -2
data/test/unit/state_machine_test.rb +1 -3
data/test/unit/string_inspect_test.rb +2 -4
data/test/unit/thrower_test.rb +7 -4
data/test/unit/yield_parameters_test.rb +0 -2
data/yard-templates/default/layout/html/google_analytics.erb +6 -9
data/yard-templates/default/layout/html/setup.rb +2 -3
metadata +81 -49
data/lib/mocha/class_method.rb +0 -119
data/lib/mocha/mini_test.rb +0 -5
data/lib/mocha/module_method.rb +0 -8
data/lib/mocha/module_methods.rb +0 -14
data/lib/mocha/parameter_matchers/object.rb +0 -17
data/lib/mocha/standalone.rb +0 -4
data/lib/mocha/unexpected_invocation.rb +0 -26
data/lib/mocha_standalone.rb +0 -4
data/test/acceptance/mock_with_initializer_block_test.rb +0 -58
data/test/unit/class_method_test.rb +0 -229

data/test/acceptance/stubbing_non_existent_instance_method_test.rb CHANGED

@@ -1,8 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   include AcceptanceTest
   def setup
@@ -14,7 +13,7 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
   def test_should_allow_stubbing_non_existent_instance_method
-    Mocha::Configuration.allow(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :allow }
     instance = Class.new.new
     test_result = run_as_test do
       instance.stubs(:non_existent_method)
@@ -24,7 +23,7 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
   def test_should_warn_when_stubbing_non_existent_instance_method
-    Mocha::Configuration.warn_when(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :warn }
     instance = Class.new.new
     test_result = run_as_test do
       instance.stubs(:non_existent_method)
@@ -34,7 +33,7 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
   def test_should_prevent_stubbing_non_existent_instance_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     instance = Class.new.new
     test_result = run_as_test do
       instance.stubs(:non_existent_method)
@@ -53,7 +52,7 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
   def test_should_allow_stubbing_existing_public_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
@@ -66,9 +65,9 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
   def test_should_allow_stubbing_method_to_which_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
@@ -80,7 +79,7 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
   def test_should_allow_stubbing_existing_protected_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
@@ -93,7 +92,7 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
   def test_should_allow_stubbing_existing_private_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
@@ -106,7 +105,7 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
   def test_should_allow_stubbing_existing_public_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
@@ -119,7 +118,7 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
   def test_should_allow_stubbing_existing_protected_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
@@ -132,7 +131,7 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
   def test_should_allow_stubbing_existing_private_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
@@ -143,5 +142,4 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
 end

data/test/acceptance/stubbing_non_public_any_instance_method_test.rb CHANGED

@@ -1,8 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 class StubbingNonPublicAnyInstanceMethodTest < Mocha::TestCase
   include AcceptanceTest
   def setup
@@ -14,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
@@ -27,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
@@ -40,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
@@ -53,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
@@ -66,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
@@ -79,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
@@ -116,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
@@ -126,5 +125,4 @@ class StubbingNonPublicAnyInstanceMethodTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
 end

data/test/acceptance/stubbing_non_public_class_method_test.rb CHANGED

@@ -1,8 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 class StubbingNonPublicClassMethodTest < Mocha::TestCase
   include AcceptanceTest
   def setup
@@ -13,8 +12,9 @@ class StubbingNonPublicClassMethodTest < Mocha::TestCase
     teardown_acceptance_test
   end
+  # 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
@@ -144,12 +144,13 @@ class StubbingNonPublicClassMethodTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
+  # 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)
+        def respond_to?(method, _include_private_methods = false)
           (method == :method_to_which_class_responds)
         end
       end
@@ -159,5 +160,4 @@ class StubbingNonPublicClassMethodTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
 end

data/test/acceptance/stubbing_non_public_instance_method_test.rb CHANGED

@@ -1,8 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 class StubbingNonPublicInstanceMethodTest < Mocha::TestCase
   include AcceptanceTest
   def setup
@@ -14,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
@@ -27,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
@@ -40,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
@@ -53,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
@@ -66,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
@@ -79,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
@@ -116,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
@@ -128,9 +127,9 @@ 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)
+      def respond_to?(method, _include_private_methods = false)
         (method == :method_to_which_instance_responds)
       end
     end.new
@@ -139,5 +138,4 @@ class StubbingNonPublicInstanceMethodTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
 end

data/test/acceptance/stubbing_on_non_mock_object_test.rb CHANGED

@@ -1,8 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 class StubbingOnNonMockObjectTest < Mocha::TestCase
   include AcceptanceTest
   def setup
@@ -14,10 +13,9 @@ 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
+      def existing_method; end
     end
     test_result = run_as_test do
       non_mock_object.stubs(:existing_method)
@@ -27,10 +25,9 @@ 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
+      def existing_method; end
     end
     test_result = run_as_test do
       non_mock_object.stubs(:existing_method)
@@ -40,10 +37,9 @@ 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
+      def existing_method; end
     end
     test_result = run_as_test do
       non_mock_object.stubs(:existing_method)
@@ -54,8 +50,7 @@ class StubbingOnNonMockObjectTest < Mocha::TestCase
   def test_should_default_to_allow_stubbing_method_on_non_mock_object
     non_mock_object = Class.new do
-      def existing_method
-      end
+      def existing_method; end
     end
     test_result = run_as_test do
       non_mock_object.stubs(:existing_method)
@@ -65,12 +60,11 @@ 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)
     end
     assert_passed(test_result)
   end
 end

data/test/acceptance/stubbing_same_class_method_on_parent_and_child_classes_test.rb CHANGED

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 class StubbingSameClassMethodOnParentAndChildClassTest < Mocha::TestCase
   include AcceptanceTest
   def setup
@@ -16,14 +14,14 @@ class StubbingSameClassMethodOnParentAndChildClassTest < Mocha::TestCase
   def test_stubbing_same_method_on_parent_and_child_classes
     parent_class = Class.new do
       def self.foo
-        "Parent.foo"
+        'Parent.foo'
       end
     end
     child_class = Class.new(parent_class)
     test_result = run_as_tests(
       :test_1 => lambda {
-        parent_class.stubs(:foo).returns("stubbed Parent.foo")
-        child_class.stubs(:foo).returns("stubbed Child.foo")
+        parent_class.stubs(:foo).returns('stubbed Parent.foo')
+        child_class.stubs(:foo).returns('stubbed Child.foo')
       },
       :test_2 => lambda {
         parent_class.foo