mocha 1.5.0 → 1.10.0

data/test/acceptance/acceptance_test_helper.rb

@@ -3,10 +3,14 @@ require 'test_runner'
 require 'mocha/configuration'
 require 'introspection'
 
-module AcceptanceTest
+if Mocha::Detection::MiniTest.testcase && (ENV['MOCHA_RUN_INTEGRATION_TESTS'] != 'test-unit')
+  require 'mocha/minitest'
+else
+  require 'mocha/test_unit'
+end
 
+module AcceptanceTest
   class FakeLogger
-
     attr_reader :warnings
 
     def initialize
@@ -16,7 +20,6 @@ module AcceptanceTest
     def warn(message)
       @warnings << message
     end
-
   end
 
   attr_reader :logger
@@ -35,5 +38,4 @@ module AcceptanceTest
   end
 
   include Introspection::Assertions
-
 end

data/test/acceptance/bug_18914_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class Bug18914Test < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -14,30 +12,26 @@ class Bug18914Test < Mocha::TestCase
   end
 
   class AlwaysEql
-
     def my_method
       true
     end
 
-    def ==(o)
+    def ==(_other)
       true
     end
 
-    def eql?(o)
+    def eql?(_other)
       true
     end
-
   end
 
   def test_should_not_allow_stubbing_of_non_mock_instance_disrupted_by_legitimate_overriding_of_eql_method
+    always_eql1 = AlwaysEql.new
+    always_eql1.stubs(:my_method).returns(false)
 
-    always_eql_1 = AlwaysEql.new
-    always_eql_1.stubs(:my_method).returns(false)
+    always_eql2 = AlwaysEql.new
+    always_eql2.stubs(:my_method).returns(false)
 
-    always_eql_2 = AlwaysEql.new
-    always_eql_2.stubs(:my_method).returns(false)
-
-    assert_equal false, always_eql_2.my_method
+    assert_equal false, always_eql2.my_method
   end
-
 end

data/test/acceptance/bug_21465_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class Bug21465Test < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -30,5 +28,4 @@ class Bug21465Test < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
 end

data/test/acceptance/bug_21563_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class Bug21563Test < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -21,5 +19,4 @@ class Bug21563Test < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
 end

data/test/acceptance/display_matching_invocations_alongside_expectations_test.rb

@@ -0,0 +1,69 @@
+require File.expand_path('../acceptance_test_helper', __FILE__)
+
+class DisplayMatchingInvocationsAlongsideExpectationsTest < Mocha::TestCase
+  include AcceptanceTest
+
+  def setup
+    setup_acceptance_test
+    Mocha.configuration.display_matching_invocations_on_failure = true
+  end
+
+  def test_should_display_results
+    test_result = run_as_test do
+      foo = mock('foo')
+      foo.expects(:bar).with(1).returns('a')
+      foo.stubs(:bar).with(any_parameters).returns('f').raises(StandardError).throws(:tag, 'value')
+
+      foo.bar(1, 2)
+      assert_raises(StandardError) { foo.bar(3, 4) }
+      assert_throws(:tag) { foo.bar(5, 6) }
+    end
+    assert_invocations(
+      test_result,
+      '- allowed any number of times, invoked 3 times: #<Mock:foo>.bar(any_parameters)',
+      '  - #<Mock:foo>.bar(1, 2) # => "f"',
+      '  - #<Mock:foo>.bar(3, 4) # => raised StandardError',
+      '  - #<Mock:foo>.bar(5, 6) # => threw (:tag, "value")'
+    )
+  end
+
+  def test_should_display_yields
+    test_result = run_as_test do
+      foo = mock('foo')
+      foo.expects(:bar).with(1).returns('a')
+      foo.stubs(:bar).with(any_parameters).multiple_yields(%w[b c], %w[d e]).returns('f').raises(StandardError).throws(:tag, 'value')
+
+      foo.bar(1, 2) { |_ignored| }
+      assert_raises(StandardError) { foo.bar(3, 4) { |_ignored| } }
+      assert_throws(:tag) { foo.bar(5, 6) { |_ignored| } }
+    end
+    assert_invocations(
+      test_result,
+      '- allowed any number of times, invoked 3 times: #<Mock:foo>.bar(any_parameters)',
+      '  - #<Mock:foo>.bar(1, 2) # => "f" after yielding ("b", "c"), then ("d", "e")',
+      '  - #<Mock:foo>.bar(3, 4) # => raised StandardError after yielding ("b", "c"), then ("d", "e")',
+      '  - #<Mock:foo>.bar(5, 6) # => threw (:tag, "value") after yielding ("b", "c"), then ("d", "e")'
+    )
+  end
+
+  def test_should_display_empty_yield_and_return
+    test_result = run_as_test do
+      foo = mock('foo')
+      foo.expects(:bar).with(1).returns('a')
+      foo.stubs(:bar).with(any_parameters).yields
+
+      foo.bar(1, 2) { |_ignored| }
+    end
+    assert_invocations(
+      test_result,
+      '- allowed any number of times, invoked once: #<Mock:foo>.bar(any_parameters)',
+      '  - #<Mock:foo>.bar(1, 2) # => nil after yielding ()'
+    )
+  end
+
+  def assert_invocations(test_result, *invocations)
+    assert_failed(test_result)
+    assert_equal invocations.unshift('satisfied expectations:'),
+                 test_result.failure_message_lines[-invocations.size..-1]
+  end
+end

data/test/acceptance/exception_rescue_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class ExceptionRescueTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -18,12 +16,12 @@ class ExceptionRescueTest < Mocha::TestCase
       mock = mock('mock')
       begin
         mock.some_method
-      rescue => e
+      rescue StandardError => e
         flunk "should not rescue #{e.class}"
       end
     end
     assert_failed(test_result)
-    assert_equal "unexpected invocation: #<Mock:mock>.some_method()", test_result.failure_message_lines[0]
+    assert_equal 'unexpected invocation: #<Mock:mock>.some_method()', test_result.failure_message_lines[0]
   end
 
   def test_invocation_never_expected_exception_is_not_caught_by_standard_rescue
@@ -32,12 +30,12 @@ class ExceptionRescueTest < Mocha::TestCase
       mock.expects(:some_method).never
       begin
         mock.some_method
-      rescue => e
+      rescue StandardError => e
         flunk "should not rescue #{e.class}"
       end
     end
     assert_failed(test_result)
-    assert_equal "unexpected invocation: #<Mock:mock>.some_method()", test_result.failure_message_lines[0]
+    assert_equal 'unexpected invocation: #<Mock:mock>.some_method()', test_result.failure_message_lines[0]
   end
 
   def test_unsatisfied_expectation_exception_is_not_caught_by_standard_rescue
@@ -47,9 +45,9 @@ class ExceptionRescueTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "not all expectations were satisfied",
-      "unsatisfied expectations:",
-      "- expected exactly once, not yet invoked: #<Mock:mock>.some_method(any_parameters)"
+      'not all expectations were satisfied',
+      'unsatisfied expectations:',
+      '- 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,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class ExpectationsOnMultipleMethodsTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -18,6 +16,7 @@ class ExpectationsOnMultipleMethodsTest < Mocha::TestCase
       def my_instance_method_1
         :original_return_value_1
       end
+
       def my_instance_method_2
         :original_return_value_2
       end
@@ -38,6 +37,7 @@ class ExpectationsOnMultipleMethodsTest < Mocha::TestCase
       def my_instance_method_1
         :original_return_value_1
       end
+
       def my_instance_method_2
         :original_return_value_2
       end

data/test/acceptance/expected_invocation_count_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class ExpectedInvocationCountTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -30,9 +28,9 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "unexpected invocation: #<Mock:mock>.method()",
-      "unsatisfied expectations:",
-      "- expected never, invoked once: #<Mock:mock>.method(any_parameters)"
+      'unexpected invocation: #<Mock:mock>.method()',
+      'unsatisfied expectations:',
+      '- expected never, invoked once: #<Mock:mock>.method(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -53,9 +51,9 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "not all expectations were satisfied",
-      "unsatisfied expectations:",
-      "- expected exactly twice, invoked once: #<Mock:mock>.method(any_parameters)"
+      'not all expectations were satisfied',
+      'unsatisfied expectations:',
+      '- expected exactly twice, invoked once: #<Mock:mock>.method(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -67,9 +65,9 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "unexpected invocation: #<Mock:mock>.method()",
-      "unsatisfied expectations:",
-      "- expected exactly twice, invoked 3 times: #<Mock:mock>.method(any_parameters)"
+      'unexpected invocation: #<Mock:mock>.method()',
+      'unsatisfied expectations:',
+      '- expected exactly twice, invoked 3 times: #<Mock:mock>.method(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -108,9 +106,9 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "not all expectations were satisfied",
-      "unsatisfied expectations:",
-      "- expected between 2 and 4 times, invoked once: #<Mock:mock>.method(any_parameters)"
+      'not all expectations were satisfied',
+      'unsatisfied expectations:',
+      '- expected between 2 and 4 times, invoked once: #<Mock:mock>.method(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -122,9 +120,9 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "unexpected invocation: #<Mock:mock>.method()",
-      "unsatisfied expectations:",
-      "- expected between 2 and 4 times, invoked 5 times: #<Mock:mock>.method(any_parameters)"
+      'unexpected invocation: #<Mock:mock>.method()',
+      'unsatisfied expectations:',
+      '- expected between 2 and 4 times, invoked 5 times: #<Mock:mock>.method(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -154,9 +152,9 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "not all expectations were satisfied",
-      "unsatisfied expectations:",
-      "- expected at least once, not yet invoked: #<Mock:mock>.method(any_parameters)"
+      'not all expectations were satisfied',
+      'unsatisfied expectations:',
+      '- expected at least once, invoked never: #<Mock:mock>.method(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -186,9 +184,9 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "unexpected invocation: #<Mock:mock>.method()",
-      "unsatisfied expectations:",
-      "- expected at most once, invoked twice: #<Mock:mock>.method(any_parameters)"
+      'unexpected invocation: #<Mock:mock>.method()',
+      'unsatisfied expectations:',
+      '- expected at most once, invoked twice: #<Mock:mock>.method(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -209,9 +207,9 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "unexpected invocation: #<Mock:stub>.method()",
-      "unsatisfied expectations:",
-      "- expected never, invoked once: #<Mock:stub>.method(any_parameters)"
+      'unexpected invocation: #<Mock:stub>.method()',
+      'unsatisfied expectations:',
+      '- expected never, invoked once: #<Mock:stub>.method(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -223,10 +221,9 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "unexpected invocation: #<Mock:mock>.method()",
-      "unsatisfied expectations:",
-      "- expected exactly once, not yet invoked: #<Mock:mock>.method(1)"
+      'unexpected invocation: #<Mock:mock>.method()',
+      'unsatisfied expectations:',
+      '- expected exactly once, invoked never: #<Mock:mock>.method(1)'
     ], test_result.failure_message_lines
   end
-
 end

data/test/acceptance/failure_messages_test.rb

@@ -1,9 +1,7 @@
 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}'
+  OBJECT_ADDRESS_PATTERN = '0x[0-9A-Fa-f]{1,12}'.freeze
 
   include AcceptanceTest
 
@@ -48,7 +46,7 @@ class FailureMessagesTest < Mocha::TestCase
 
   def test_should_display_mock_address_when_expectation_was_on_unnamed_mock
     test_result = run_as_test do
-      foo = mock()
+      foo = mock
       foo.expects(:bar)
     end
     assert_match Regexp.new("#<Mock:#{OBJECT_ADDRESS_PATTERN}>"), test_result.failures[0].message
@@ -58,7 +56,6 @@ class FailureMessagesTest < Mocha::TestCase
     test_result = run_as_test do
       'Foo'.expects(:bar)
     end
-    assert_match Regexp.new(%{"Foo"}), test_result.failures[0].message
+    assert_match Regexp.new(%("Foo")), test_result.failures[0].message
   end
-
 end

data/test/acceptance/issue_272_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class Issue272Test < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -39,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,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class Issue65Test < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -16,48 +14,51 @@ class Issue65Test < Mocha::TestCase
   def test_expectations_on_class_methods_on_same_class_should_be_verified_in_consecutive_tests
     klass = Class.new do
       def self.foo; end
+
       def self.bar; end
     end
-    test_1 = run_as_test do
+    test1 = run_as_test do
       klass.expects(:foo)
       klass.foo
     end
-    assert_passed(test_1)
-    test_2 = run_as_test do
+    assert_passed(test1)
+    test2 = run_as_test do
       klass.expects(:bar)
     end
-    assert_failed(test_2)
+    assert_failed(test2)
   end
 
   def test_expectations_on_any_instance_methods_on_same_class_should_be_verified_in_consecutive_tests
     klass = Class.new do
       def foo; end
+
       def bar; end
     end
-    test_1 = run_as_test do
+    test1 = run_as_test do
       klass.any_instance.expects(:foo)
       klass.new.foo
     end
-    assert_passed(test_1)
-    test_2 = run_as_test do
+    assert_passed(test1)
+    test2 = run_as_test do
       klass.any_instance.expects(:bar)
     end
-    assert_failed(test_2)
+    assert_failed(test2)
   end
 
   def test_expectations_on_instance_methods_on_same_object_should_be_verified_in_consecutive_tests
     instance = Class.new do
       def foo; end
+
       def bar; end
     end.new
-    test_1 = run_as_test do
+    test1 = run_as_test do
       instance.expects(:foo)
       instance.foo
     end
-    assert_passed(test_1)
-    test_2 = run_as_test do
+    assert_passed(test1)
+    test2 = run_as_test do
       instance.expects(:bar)
     end
-    assert_failed(test_2)
+    assert_failed(test2)
   end
 end