mocha 1.7.0 → 1.10.2

data/test/acceptance/mocha_example_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../../test_helper', __FILE__)
-require 'mocha/setup'
 
 class MochaExampleTest < Mocha::TestCase
   class Rover

data/test/acceptance/mocha_test_result_test.rb

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

data/test/acceptance/mock_built_with_first_argument_type_being_string_test.rb

@@ -0,0 +1,99 @@
+require File.expand_path('../acceptance_test_helper', __FILE__)
+require 'deprecation_disabler'
+
+class MockBuiltWithFirstArgumentTypeBeingStringTest < Mocha::TestCase
+  include AcceptanceTest
+
+  def setup
+    setup_acceptance_test
+    Mocha.configure { |c| c.reinstate_undocumented_behaviour_from_v1_9 = true }
+  end
+
+  def teardown
+    teardown_acceptance_test
+  end
+
+  def test_mock_built_with_single_symbol_argument_with_satisfied_expectation
+    test_result = run_as_test do
+      DeprecationDisabler.disable_deprecations do
+        m = mock(:my_method)
+        assert_nil m.my_method
+      end
+      expected_warning = 'Explicitly include `my_method` in Hash of expected methods vs return values, e.g. `mock(:my_method => nil)`.'
+      assert_equal expected_warning, Mocha::Deprecation.messages.last
+    end
+    assert_passed(test_result)
+  end
+
+  def test_mock_built_with_single_symbol_argument_with_unsatisfied_expectation
+    test_result = run_as_test do
+      DeprecationDisabler.disable_deprecations do
+        mock(:my_method)
+      end
+    end
+    assert_failed(test_result)
+    assert(test_result.failure_message_lines.any? do |line|
+      line[/expected exactly once, invoked never\: #<Mock\:0x[0-9a-f]+>\.my_method\(any_parameters\)/]
+    end)
+  end
+
+  def test_stub_built_with_single_symbol_argument
+    test_result = run_as_test do
+      DeprecationDisabler.disable_deprecations do
+        s = stub(:my_method)
+        assert_nil s.my_method
+      end
+      expected_warning = 'Explicitly include `my_method` in Hash of stubbed methods vs return values, e.g. `stub(:my_method => nil)`.'
+      assert_equal expected_warning, Mocha::Deprecation.messages.last
+    end
+    assert_passed(test_result)
+  end
+
+  def test_mock_built_with_first_argument_a_symbol_and_second_argument_a_hash
+    test_result = run_as_test do
+      DeprecationDisabler.disable_deprecations do
+        s = mock(:my_method, :another_method => 123)
+        assert_nil s.my_method
+      end
+      expected_warning = 'In this case the 2nd argument for `mock(:#my_method, ...)` is ignored, but in the future a Hash of expected methods vs return values will be respected.'
+      assert Mocha::Deprecation.messages.last(2).include?(expected_warning)
+    end
+    assert_passed(test_result)
+  end
+
+  def test_stub_built_with_first_argument_a_symbol_and_second_argument_a_hash
+    test_result = run_as_test do
+      DeprecationDisabler.disable_deprecations do
+        s = stub(:my_method, :another_method => 123)
+        assert_nil s.my_method
+      end
+      expected_warning = 'In this case the 2nd argument for `stub(:#my_method, ...)` is ignored, but in the future a Hash of stubbed methods vs return values will be respected.'
+      assert Mocha::Deprecation.messages.last(2).include?(expected_warning)
+    end
+    assert_passed(test_result)
+  end
+
+  def test_stub_everything_built_with_single_symbol_argument
+    test_result = run_as_test do
+      DeprecationDisabler.disable_deprecations do
+        s = stub_everything(:my_method)
+        assert_nil s.my_method
+      end
+      expected_warning = 'Explicitly include `my_method` in Hash of stubbed methods vs return values, e.g. `stub_everything(:my_method => nil)`.'
+      assert_equal expected_warning, Mocha::Deprecation.messages.last
+    end
+    assert_passed(test_result)
+  end
+
+  def test_stub_everything_built_with_first_argument_a_symbol_and_second_argument_a_hash
+    test_result = run_as_test do
+      DeprecationDisabler.disable_deprecations do
+        s = stub_everything(:my_method, :another_method => 123)
+        assert_nil s.my_method
+      end
+      expected_warning = 'In this case the 2nd argument for `stub_everything(:#my_method, ...)` is ignored, but in the future a Hash of stubbed methods vs return values will be respected.' # rubocop:disable Metrics/LineLength
+      assert Mocha::Deprecation.messages.last(2).include?(expected_warning)
+    end
+    assert_passed(test_result)
+  end
+end

data/test/acceptance/mock_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class MockTest < Mocha::TestCase
   include AcceptanceTest
@@ -29,7 +28,7 @@ class MockTest < Mocha::TestCase
     assert_failed(test_result)
   end
 
-  def test_should_build_named_mock_and_explicitly_add_an_expectation_which_is_satisfied
+  def test_should_build_string_named_mock_and_explicitly_add_an_expectation_which_is_satisfied
     test_result = run_as_test do
       foo = mock('foo')
       foo.expects(:bar)
@@ -38,7 +37,16 @@ class MockTest < Mocha::TestCase
     assert_passed(test_result)
   end
 
-  def test_should_build_named_mock_and_explicitly_add_an_expectation_which_is_not_satisfied
+  def test_should_build_symbol_named_mock_and_explicitly_add_an_expectation_which_is_satisfied
+    test_result = run_as_test do
+      foo = mock(:foo)
+      foo.expects(:bar)
+      foo.bar
+    end
+    assert_passed(test_result)
+  end
+
+  def test_should_build_string_named_mock_and_explicitly_add_an_expectation_which_is_not_satisfied
     test_result = run_as_test do
       foo = mock('foo')
       foo.expects(:bar)
@@ -46,6 +54,14 @@ class MockTest < Mocha::TestCase
     assert_failed(test_result)
   end
 
+  def test_should_build_symbol_named_mock_and_explicitly_add_an_expectation_which_is_not_satisfied
+    test_result = run_as_test do
+      foo = mock(:foo)
+      foo.expects(:bar)
+    end
+    assert_failed(test_result)
+  end
+
   def test_should_build_mock_incorporating_two_expectations_which_are_satisifed
     test_result = run_as_test do
       foo = mock(:bar => 'bar', :baz => 'baz')
@@ -71,7 +87,7 @@ class MockTest < Mocha::TestCase
     assert_failed(test_result)
   end
 
-  def test_should_build_named_mock_incorporating_two_expectations_which_are_satisifed
+  def test_should_build_string_named_mock_incorporating_two_expectations_which_are_satisifed
     test_result = run_as_test do
       foo = mock('foo', :bar => 'bar', :baz => 'baz')
       foo.bar
@@ -80,7 +96,16 @@ class MockTest < Mocha::TestCase
     assert_passed(test_result)
   end
 
-  def test_should_build_named_mock_incorporating_two_expectations_the_first_of_which_is_not_satisifed
+  def test_should_build_symbol_named_mock_incorporating_two_expectations_which_are_satisifed
+    test_result = run_as_test do
+      foo = mock(:foo, :bar => 'bar', :baz => 'baz')
+      foo.bar
+      foo.baz
+    end
+    assert_passed(test_result)
+  end
+
+  def test_should_build_string_named_mock_incorporating_two_expectations_the_first_of_which_is_not_satisifed
     test_result = run_as_test do
       foo = mock('foo', :bar => 'bar', :baz => 'baz')
       foo.baz
@@ -88,11 +113,27 @@ class MockTest < Mocha::TestCase
     assert_failed(test_result)
   end
 
-  def test_should_build_named_mock_incorporating_two_expectations_the_second_of_which_is_not_satisifed
+  def test_should_build_symbol_named_mock_incorporating_two_expectations_the_first_of_which_is_not_satisifed
+    test_result = run_as_test do
+      foo = mock(:foo, :bar => 'bar', :baz => 'baz')
+      foo.baz
+    end
+    assert_failed(test_result)
+  end
+
+  def test_should_build_string_named_mock_incorporating_two_expectations_the_second_of_which_is_not_satisifed
     test_result = run_as_test do
       foo = mock('foo', :bar => 'bar', :baz => 'baz')
       foo.bar
     end
     assert_failed(test_result)
   end
+
+  def test_should_build_symbol_named_mock_incorporating_two_expectations_the_second_of_which_is_not_satisifed
+    test_result = run_as_test do
+      foo = mock(:foo, :bar => 'bar', :baz => 'baz')
+      foo.bar
+    end
+    assert_failed(test_result)
+  end
 end

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