mocha 1.9.0 → 1.11.1

data/test/acceptance/exception_rescue_test.rb

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

data/test/acceptance/expectations_on_multiple_methods_test.rb

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

data/test/acceptance/expected_invocation_count_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class ExpectedInvocationCountTest < Mocha::TestCase
   include AcceptanceTest
@@ -155,7 +154,7 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     assert_equal [
       'not all expectations were satisfied',
       'unsatisfied expectations:',
-      '- expected at least once, not yet invoked: #<Mock:mock>.method(any_parameters)'
+      '- expected at least once, invoked never: #<Mock:mock>.method(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -224,7 +223,7 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     assert_equal [
       'unexpected invocation: #<Mock:mock>.method()',
       'unsatisfied expectations:',
-      '- expected exactly once, not yet invoked: #<Mock:mock>.method(1)'
+      '- expected exactly once, invoked never: #<Mock:mock>.method(1)'
     ], test_result.failure_message_lines
   end
 end

data/test/acceptance/failure_messages_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class FailureMessagesTest < Mocha::TestCase
   OBJECT_ADDRESS_PATTERN = '0x[0-9A-Fa-f]{1,12}'.freeze
@@ -59,4 +58,20 @@ class FailureMessagesTest < Mocha::TestCase
     end
     assert_match Regexp.new(%("Foo")), test_result.failures[0].message
   end
+
+  def test_should_display_that_block_was_expected
+    test_result = run_as_test do
+      foo = mock
+      foo.expects(:bar).with_block_given
+    end
+    assert_match Regexp.new(' with block given$'), test_result.failures[0].message
+  end
+
+  def test_should_display_that_block_was_not_expected
+    test_result = run_as_test do
+      foo = mock
+      foo.expects(:bar).with_no_block_given
+    end
+    assert_match Regexp.new(' with no block given$'), test_result.failures[0].message
+  end
 end

data/test/acceptance/issue_272_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class Issue272Test < Mocha::TestCase
   include AcceptanceTest
@@ -38,7 +37,7 @@ class Issue272Test < Mocha::TestCase
       Klass.stubs(:foo).returns('stubbed-foo')
       # hangs in next line executing:
       # `@original_method = stubbee._method(method)`
-      # in Mocha::ClassMethod#hide_original_method
+      # in Mocha::StubbedMethod#hide_original_method
       # but only in Ruby v2.3, not v2.2
       Klass.stubs(:bar).returns('stubbed-bar')
       assert_equal 'stubbed-foo', Klass.foo

data/test/acceptance/issue_65_test.rb

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

data/test/acceptance/issue_70_test.rb

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

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,98 @@
+require File.expand_path('../acceptance_test_helper', __FILE__)
+require 'deprecation_disabler'
+
+class MockBuiltWithFirstArgumentTypeBeingStringTest < Mocha::TestCase
+  include AcceptanceTest
+
+  def setup
+    setup_acceptance_test
+  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,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
+require 'deprecation_disabler'
 
 class MockTest < Mocha::TestCase
   include AcceptanceTest
@@ -29,7 +30,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 +39,20 @@ 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
+      Mocha::Configuration.override(:reinstate_undocumented_behaviour_from_v1_9 => false) do
+        DeprecationDisabler.disable_deprecations do
+          foo = mock(:foo)
+          foo.expects(:bar)
+          foo.bar
+        end
+      end
+    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 +60,16 @@ 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
+      DeprecationDisabler.disable_deprecations do
+        foo = mock(:foo)
+        foo.expects(:bar)
+      end
+    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 +95,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 +104,20 @@ 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
+      Mocha::Configuration.override(:reinstate_undocumented_behaviour_from_v1_9 => false) do
+        DeprecationDisabler.disable_deprecations do
+          foo = mock(:foo, :bar => 'bar', :baz => 'baz')
+          foo.bar
+          foo.baz
+        end
+      end
+    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 +125,31 @@ 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
+      DeprecationDisabler.disable_deprecations do
+        foo = mock(:foo, :bar => 'bar', :baz => 'baz')
+        foo.baz
+      end
+    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
+      DeprecationDisabler.disable_deprecations do
+        foo = mock(:foo, :bar => 'bar', :baz => 'baz')
+        foo.bar
+      end
+    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/multiple_yielding_test.rb

@@ -0,0 +1,59 @@
+require File.expand_path('../acceptance_test_helper', __FILE__)
+require 'mocha/configuration'
+
+class MultipleYieldingTest < Mocha::TestCase
+  include AcceptanceTest
+
+  def setup
+    setup_acceptance_test
+  end
+
+  def teardown
+    teardown_acceptance_test
+  end
+
+  def test_yields_values_multiple_times_when_stubbed_method_is_invoked
+    test_result = run_as_test do
+      m = mock('m')
+      m.stubs(:foo).multiple_yields([1], [2, 3])
+      yielded = []
+      m.foo { |*args| yielded << args }
+      assert_equal [[1], [2, 3]], yielded
+    end
+    assert_passed(test_result)
+  end
+
+  def test_yields_values_multiple_times_when_multiple_yields_arguments_are_not_arrays
+    test_result = run_as_test do
+      m = mock('m')
+      m.stubs(:foo).multiple_yields(1, { :b => 2 }, '3')
+      yielded = []
+      m.foo { |*args| yielded << args }
+      assert_equal [[1], [{ :b => 2 }], ['3']], yielded
+    end
+    assert_passed(test_result)
+  end
+
+  def test_raises_local_jump_error_if_instructed_to_multiple_yield_but_no_block_given
+    test_result = run_as_test do
+      Mocha::Configuration.override(:reinstate_undocumented_behaviour_from_v1_9 => false) do
+        m = mock('m')
+        m.stubs(:foo).multiple_yields([])
+        assert_raises(LocalJumpError) { m.foo }
+      end
+    end
+    assert_passed(test_result)
+  end
+
+  def test_yields_different_values_on_consecutive_invocations
+    test_result = run_as_test do
+      m = mock('m')
+      m.stubs(:foo).multiple_yields([0], [1, 2]).then.multiple_yields([3], [4, 5])
+      yielded = []
+      m.foo { |*args| yielded << args }
+      m.foo { |*args| yielded << args }
+      assert_equal [[0], [1, 2], [3], [4, 5]], yielded
+    end
+    assert_passed(test_result)
+  end
+end

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