mocha 1.9.0 → 1.10.0.alpha

data/test/acceptance/mocked_methods_dispatch_test.rb

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

data/test/acceptance/multiple_expectations_failure_message_test.rb

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

data/test/acceptance/optional_parameters_test.rb

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

data/test/acceptance/parameter_matcher_test.rb

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

data/test/acceptance/partial_mocks_test.rb

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

data/test/acceptance/prepend_test.rb

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

data/test/acceptance/prevent_use_of_mocha_outside_test_test.rb

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

data/test/acceptance/raise_exception_test.rb

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

data/test/acceptance/return_value_test.rb

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

data/test/acceptance/sequence_test.rb

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

data/test/acceptance/states_test.rb

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

data/test/acceptance/stub_any_instance_method_defined_on_superclass_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class StubAnyInstanceMethodDefinedOnSuperclassTest < Mocha::TestCase
   include AcceptanceTest
@@ -59,7 +58,7 @@ class StubAnyInstanceMethodDefinedOnSuperclassTest < Mocha::TestCase
     assert_equal [
       'not all expectations were satisfied',
       'unsatisfied expectations:',
-      '- expected exactly once, not yet invoked: #<AnyInstance:superklass>.my_instance_method(any_parameters)'
+      '- expected exactly once, invoked never: #<AnyInstance:superklass>.my_instance_method(any_parameters)'
     ], test_result.failure_message_lines
   end
 end

data/test/acceptance/stub_any_instance_method_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class StubAnyInstanceMethodTest < Mocha::TestCase
   include AcceptanceTest
@@ -43,6 +42,26 @@ class StubAnyInstanceMethodTest < Mocha::TestCase
     assert_equal :original_return_value, instance.my_instance_method
   end
 
+  def test_should_leave_stubbed_public_method_unchanged_after_test_when_it_was_originally_private_in_owning_module
+    module_with_private_method = Module.new do
+      def my_included_method
+        :original_return_value
+      end
+      private :my_included_method
+    end
+    klass = Class.new do
+      include module_with_private_method
+      public :my_included_method
+    end
+    instance = klass.new
+    test_result = run_as_test do
+      klass.any_instance.stubs(:my_included_method).returns(:new_return_value)
+      assert_equal :new_return_value, instance.my_included_method
+    end
+    assert_passed(test_result)
+    assert_equal :original_return_value, instance.my_included_method
+  end
+
   def test_should_leave_stubbed_protected_method_unchanged_after_test
     klass = Class.new do
       def my_instance_method

data/test/acceptance/stub_class_method_defined_on_active_record_association_proxy_test.rb

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

data/test/acceptance/stub_class_method_defined_on_class_test.rb

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

data/test/acceptance/stub_class_method_defined_on_module_test.rb

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

data/test/acceptance/stub_class_method_defined_on_superclass_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class StubClassMethodDefinedOnSuperclassTest < Mocha::TestCase
   include AcceptanceTest
@@ -138,7 +137,7 @@ class StubClassMethodDefinedOnSuperclassTest < Mocha::TestCase
     assert_equal [
       'not all expectations were satisfied',
       'unsatisfied expectations:',
-      '- expected exactly once, not yet invoked: superklass.my_class_method(any_parameters)'
+      '- expected exactly once, invoked never: superklass.my_class_method(any_parameters)'
     ], test_result.failure_message_lines
   end
   # rubocop:enable Lint/DuplicateMethods

data/test/acceptance/stub_everything_test.rb

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

data/test/acceptance/stub_instance_method_defined_on_active_record_association_proxy_test.rb

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

data/test/acceptance/stub_instance_method_defined_on_class_and_aliased_test.rb

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

data/test/acceptance/stub_instance_method_defined_on_class_test.rb

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

data/test/acceptance/stub_instance_method_defined_on_kernel_module_test.rb

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

data/test/acceptance/stub_instance_method_defined_on_module_test.rb

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

data/test/acceptance/stub_instance_method_defined_on_object_class_test.rb

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

data/test/acceptance/stub_instance_method_defined_on_singleton_class_test.rb

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

data/test/acceptance/stub_instance_method_defined_on_superclass_test.rb

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

data/test/acceptance/stub_method_defined_on_module_and_aliased_test.rb

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

data/test/acceptance/stub_module_method_test.rb

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

data/test/acceptance/stub_test.rb

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

data/test/acceptance/stubba_example_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../../test_helper', __FILE__)
-require 'mocha/setup'
 
 class Widget
   def model

data/test/acceptance/stubba_test_result_test.rb

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

data/test/acceptance/stubbing_error_backtrace_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 require 'execution_point'
 
 class StubbingErrorBacktraceTest < Mocha::TestCase
@@ -17,7 +16,7 @@ class StubbingErrorBacktraceTest < Mocha::TestCase
   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,7 +52,7 @@ 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

data/test/acceptance/stubbing_frozen_object_test.rb

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

data/test/acceptance/stubbing_method_accepting_block_parameter_test.rb

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

data/test/acceptance/stubbing_method_unnecessarily_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 
 class StubbingMethodUnnecessarilyTest < Mocha::TestCase
   include AcceptanceTest
@@ -13,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)
@@ -23,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)
@@ -33,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)
@@ -52,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)

data/test/acceptance/stubbing_nil_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 
 class StubbingNilTest < Mocha::TestCase
   include AcceptanceTest
@@ -14,7 +14,7 @@ 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
@@ -23,7 +23,7 @@ class StubbingNilTest < Mocha::TestCase
     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
@@ -32,7 +32,7 @@ class StubbingNilTest < Mocha::TestCase
     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
@@ -49,7 +49,7 @@ class StubbingNilTest < Mocha::TestCase
     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,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 
 class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   include AcceptanceTest
@@ -13,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)
@@ -23,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)
@@ -33,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)
@@ -52,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
@@ -64,7 +64,7 @@ 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)
         (method == :method_to_which_instance_responds)
@@ -77,7 +77,7 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   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
@@ -89,7 +89,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
@@ -101,7 +101,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
@@ -114,7 +114,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
@@ -127,7 +127,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