mocha 1.4.0 → 1.7.0

data/test/acceptance/stubbing_non_existent_any_instance_method_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -67,7 +66,7 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   def test_should_allow_stubbing_method_to_which_any_instance_responds
     Mocha::Configuration.prevent(:stubbing_non_existent_method)
     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
@@ -139,5 +138,4 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
 end

data/test/acceptance/stubbing_non_existent_class_method_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class StubbingNonExistentClassMethodTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -52,6 +51,7 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
     assert_passed(test_result)
   end
 
+  # rubocop:disable Lint/DuplicateMethods
   def test_should_allow_stubbing_existing_public_class_method
     Mocha::Configuration.prevent(:stubbing_non_existent_method)
     klass = Class.new do
@@ -70,7 +70,7 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
     Mocha::Configuration.prevent(:stubbing_non_existent_method)
     klass = Class.new do
       class << self
-        def respond_to?(method, include_private = false)
+        def respond_to?(method, _include_private = false)
           (method == :method_to_which_class_responds)
         end
       end
@@ -153,5 +153,5 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
+  # rubocop:enable Lint/DuplicateMethods
 end

data/test/acceptance/stubbing_non_existent_instance_method_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -68,7 +67,7 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   def test_should_allow_stubbing_method_to_which_instance_responds
     Mocha::Configuration.prevent(:stubbing_non_existent_method)
     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
@@ -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

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class StubbingNonPublicAnyInstanceMethodTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -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

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class StubbingNonPublicClassMethodTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -13,6 +12,7 @@ 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)
     klass = Class.new do
@@ -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)
     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

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class StubbingNonPublicInstanceMethodTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -130,7 +129,7 @@ class StubbingNonPublicInstanceMethodTest < Mocha::TestCase
   def test_should_allow_stubbing_method_to_which_instance_responds
     Mocha::Configuration.prevent(:stubbing_non_public_method)
     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

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class StubbingOnNonMockObjectTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -16,8 +15,7 @@ class StubbingOnNonMockObjectTest < Mocha::TestCase
   def test_should_allow_stubbing_method_on_non_mock_object
     Mocha::Configuration.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)
@@ -29,8 +27,7 @@ class StubbingOnNonMockObjectTest < Mocha::TestCase
   def test_should_warn_on_stubbing_method_on_non_mock_object
     Mocha::Configuration.warn_when(: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)
@@ -42,8 +39,7 @@ class StubbingOnNonMockObjectTest < Mocha::TestCase
   def test_should_prevent_stubbing_method_on_non_mock_object
     Mocha::Configuration.prevent(: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)
@@ -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)
@@ -72,5 +67,4 @@ class StubbingOnNonMockObjectTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
 end

data/test/acceptance/stubbing_same_class_method_on_parent_and_child_classes_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class StubbingSameClassMethodOnParentAndChildClassTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -16,14 +15,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

data/test/acceptance/throw_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class ThrowTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -41,5 +40,4 @@ class ThrowTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
 end

data/test/acceptance/unexpected_invocation_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class UnexpectedInvocationTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -20,6 +19,6 @@ class UnexpectedInvocationTest < Mocha::TestCase
       instance.inspect(1, 2, 'foo')
     end
     assert_failed(test_result)
-    assert_equal "unexpected invocation: inspect(1, 2, foo)", test_result.failure_message_lines[0]
+    assert_equal 'unexpected invocation: inspect(1, 2, foo)', test_result.failure_message_lines[0]
   end
-end
+end

data/test/acceptance/unstubbing_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class UnstubbingTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -15,7 +14,9 @@ class UnstubbingTest < Mocha::TestCase
 
   def test_unstubbing_an_instance_method_should_restore_original_behaviour
     klass = Class.new do
-      def my_instance_method; :original_return_value; end
+      def my_instance_method
+        :original_return_value
+      end
     end
     test_result = run_as_test do
       object = klass.new
@@ -28,7 +29,9 @@ class UnstubbingTest < Mocha::TestCase
 
   def test_unstubbing_a_class_method_should_restore_original_behaviour
     klass = Class.new do
-      def self.my_class_method; :original_return_value; end
+      def self.my_class_method
+        :original_return_value
+      end
     end
     test_result = run_as_test do
       klass.stubs(:my_class_method).returns(:new_return_value)
@@ -40,7 +43,9 @@ class UnstubbingTest < Mocha::TestCase
 
   def test_unstubbing_a_module_method_should_restore_original_behaviour
     mod = Module.new do
-      def self.my_module_method; :original_return_value; end
+      def self.my_module_method
+        :original_return_value
+      end
     end
     test_result = run_as_test do
       mod.stubs(:my_module_method).returns(:new_return_value)
@@ -52,7 +57,9 @@ class UnstubbingTest < Mocha::TestCase
 
   def test_unstubbing_a_module_method_defined_like_fileutils_in_ruby_2_0_should_restore_original_behaviour
     mod = Module.new do
-      def my_module_method; :original_return_value; end
+      def my_module_method
+        :original_return_value
+      end
       private :my_module_method
       extend self
       class << self
@@ -69,7 +76,9 @@ class UnstubbingTest < Mocha::TestCase
 
   def test_unstubbing_an_any_instance_method_should_restore_original_behaviour
     klass = Class.new do
-      def my_instance_method; :original_return_value; end
+      def my_instance_method
+        :original_return_value
+      end
     end
     test_result = run_as_test do
       object = klass.new
@@ -82,8 +91,13 @@ class UnstubbingTest < Mocha::TestCase
 
   def test_unstubbing_multiple_methods_should_restore_original_behaviour
     klass = Class.new do
-      def my_first_instance_method; :original_return_value; end
-      def my_second_instance_method; :original_return_value; end
+      def my_first_instance_method
+        :original_return_value
+      end
+
+      def my_second_instance_method
+        :original_return_value
+      end
     end
     test_result = run_as_test do
       object = klass.new
@@ -98,7 +112,9 @@ class UnstubbingTest < Mocha::TestCase
 
   def test_unstubbing_a_method_multiple_times_should_restore_original_behaviour
     klass = Class.new do
-      def my_instance_method; :original_return_value; end
+      def my_instance_method
+        :original_return_value
+      end
     end
     test_result = run_as_test do
       object = klass.new
@@ -112,7 +128,9 @@ class UnstubbingTest < Mocha::TestCase
 
   def test_unstubbing_a_non_stubbed_method_should_do_nothing
     klass = Class.new do
-      def my_instance_method; :original_return_value; end
+      def my_instance_method
+        :original_return_value
+      end
     end
     test_result = run_as_test do
       object = klass.new
@@ -124,7 +142,9 @@ class UnstubbingTest < Mocha::TestCase
 
   def test_unstubbing_a_method_which_was_stubbed_multiple_times_should_restore_orginal_behaviour
     klass = Class.new do
-      def my_instance_method; :original_return_value; end
+      def my_instance_method
+        :original_return_value
+      end
     end
     test_result = run_as_test do
       object = klass.new
@@ -138,8 +158,13 @@ class UnstubbingTest < Mocha::TestCase
 
   def test_unstubbing_a_method_should_not_unstub_other_stubbed_methods
     klass = Class.new do
-      def my_first_instance_method; :first_return_value; end
-      def my_second_instance_method; :second_return_value; end
+      def my_first_instance_method
+        :first_return_value
+      end
+
+      def my_second_instance_method
+        :second_return_value
+      end
     end
 
     test_result = run_as_test do
@@ -155,7 +180,9 @@ class UnstubbingTest < Mocha::TestCase
 
   def test_unstubbing_a_method_should_remove_all_expectations_for_that_method
     klass = Class.new do
-      def my_instance_method; :original_return_value; end
+      def my_instance_method
+        :original_return_value
+      end
     end
     test_result = run_as_test do
       object = klass.new

data/test/deprecation_disabler.rb

@@ -1,7 +1,6 @@
 require 'mocha/deprecation'
 
 module DeprecationDisabler
-
   def disable_deprecations
     original_mode = Mocha::Deprecation.mode
     Mocha::Deprecation.mode = :disabled

data/test/execution_point.rb

@@ -1,5 +1,4 @@
 class ExecutionPoint
-
   attr_reader :backtrace
 
   def self.current
@@ -11,7 +10,7 @@ class ExecutionPoint
   end
 
   def first_relevant_line_of_backtrace
-    @backtrace && (@backtrace.reject { |l| /\Aorg\/jruby\//.match(l) }.first || 'unknown:0')
+    @backtrace && (@backtrace.reject { |l| %r{\Aorg/jruby/}.match(l) }.first || 'unknown:0')
   end
 
   def file_name
@@ -24,7 +23,7 @@ class ExecutionPoint
 
   def ==(other)
     return false unless other.is_a?(ExecutionPoint)
-    (file_name == other.file_name) and (line_number == other.line_number)
+    (file_name == other.file_name) && (line_number == other.line_number)
   end
 
   def to_s
@@ -34,5 +33,4 @@ class ExecutionPoint
   def inspect
     to_s
   end
-
 end

data/test/integration/mini_test_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../test_helper', __FILE__)
 
-require "mocha/minitest"
-require "integration/shared_tests"
+require 'mocha/minitest'
+require 'integration/shared_tests'
 
 class MiniTestTest < Mocha::TestCase
   include SharedTests

data/test/integration/shared_tests.rb

@@ -11,6 +11,7 @@ module SharedTests
     assert_passed(test_result)
   end
 
+  # rubocop:disable Style/Semicolon
   def test_assertion_unsatisfied
     execution_point = nil
     test_result = run_as_test do
@@ -24,19 +25,19 @@ module SharedTests
   def test_mock_object_unexpected_invocation
     execution_point = nil
     test_result = run_as_test do
-      mock = mock("not expecting invocation")
+      mock = mock('not expecting invocation')
       execution_point = ExecutionPoint.current; mock.unexpected
     end
     assert_failed(test_result)
     failure = test_result.failures.first
     assert_equal execution_point, ExecutionPoint.new(failure.location)
-    assert_equal ["unexpected invocation: #<Mock:not expecting invocation>.unexpected()"], test_result.failure_message_lines
+    assert_equal ['unexpected invocation: #<Mock:not expecting invocation>.unexpected()'], test_result.failure_message_lines
   end
 
   def test_mock_object_explicitly_unexpected_invocation
     execution_point = nil
     test_result = run_as_test do
-      mock = mock("not expecting invocation")
+      mock = mock('not expecting invocation')
       mock.expects(:unexpected).never
       execution_point = ExecutionPoint.current; mock.unexpected
     end
@@ -44,25 +45,25 @@ module SharedTests
     failure = test_result.failures.first
     assert_equal execution_point, ExecutionPoint.new(failure.location)
     assert_equal [
-      "unexpected invocation: #<Mock:not expecting invocation>.unexpected()",
-      "unsatisfied expectations:",
-      "- expected never, invoked once: #<Mock:not expecting invocation>.unexpected(any_parameters)"
+      'unexpected invocation: #<Mock:not expecting invocation>.unexpected()',
+      'unsatisfied expectations:',
+      '- expected never, invoked once: #<Mock:not expecting invocation>.unexpected(any_parameters)'
     ], test_result.failure_message_lines
   end
 
   def test_mock_object_unsatisfied_expectation
     execution_point = nil
     test_result = run_as_test do
-      mock = mock("expecting invocation")
+      mock = mock('expecting invocation')
       execution_point = ExecutionPoint.current; mock.expects(:expected)
     end
     assert_failed(test_result)
     failure = test_result.failures.first
     assert_equal execution_point, ExecutionPoint.new(failure.location)
     assert_equal [
-      "not all expectations were satisfied",
-      "unsatisfied expectations:",
-      "- expected exactly once, not yet invoked: #<Mock:expecting invocation>.expected(any_parameters)"
+      'not all expectations were satisfied',
+      'unsatisfied expectations:',
+      '- expected exactly once, not yet invoked: #<Mock:expecting invocation>.expected(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -70,7 +71,7 @@ module SharedTests
     execution_point = nil
     test_result = run_as_tests(
       :setup => lambda {
-        mock = mock("not expecting invocation")
+        mock = mock('not expecting invocation')
         execution_point = ExecutionPoint.current; mock.unexpected
       },
       :test_me => lambda {
@@ -80,14 +81,14 @@ module SharedTests
     assert_failed(test_result)
     failure = test_result.failures.first
     assert_equal execution_point, ExecutionPoint.new(failure.location)
-    assert_equal ["unexpected invocation: #<Mock:not expecting invocation>.unexpected()"], test_result.failure_message_lines
+    assert_equal ['unexpected invocation: #<Mock:not expecting invocation>.unexpected()'], test_result.failure_message_lines
   end
 
   def test_mock_object_unsatisfied_expectation_in_setup
     execution_point = nil
     test_result = run_as_tests(
       :setup => lambda {
-        mock = mock("expecting invocation")
+        mock = mock('expecting invocation')
         execution_point = ExecutionPoint.current; mock.expects(:expected)
       },
       :test_me => lambda {
@@ -98,9 +99,9 @@ module SharedTests
     failure = test_result.failures.first
     assert_equal execution_point, ExecutionPoint.new(failure.location)
     assert_equal [
-      "not all expectations were satisfied",
-      "unsatisfied expectations:",
-      "- expected exactly once, not yet invoked: #<Mock:expecting invocation>.expected(any_parameters)"
+      'not all expectations were satisfied',
+      'unsatisfied expectations:',
+      '- expected exactly once, not yet invoked: #<Mock:expecting invocation>.expected(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -111,14 +112,14 @@ module SharedTests
         assert true
       },
       :teardown => lambda {
-        mock = mock("not expecting invocation")
+        mock = mock('not expecting invocation')
         execution_point = ExecutionPoint.current; mock.unexpected
       }
     )
     assert_failed(test_result)
     failure = test_result.failures.first
     assert_equal execution_point, ExecutionPoint.new(failure.location)
-    assert_equal ["unexpected invocation: #<Mock:not expecting invocation>.unexpected()"], test_result.failure_message_lines
+    assert_equal ['unexpected invocation: #<Mock:not expecting invocation>.unexpected()'], test_result.failure_message_lines
   end
 
   def test_real_object_explicitly_unexpected_invocation
@@ -133,7 +134,7 @@ module SharedTests
     assert_equal execution_point, ExecutionPoint.new(failure.location)
     assert_equal [
       "unexpected invocation: #{object.mocha_inspect}.unexpected()",
-      "unsatisfied expectations:",
+      'unsatisfied expectations:',
       "- expected never, invoked once: #{object.mocha_inspect}.unexpected(any_parameters)"
     ], test_result.failure_message_lines
   end
@@ -148,8 +149,8 @@ module SharedTests
     failure = test_result.failures.first
     assert_equal execution_point, ExecutionPoint.new(failure.location)
     assert_equal [
-      "not all expectations were satisfied",
-      "unsatisfied expectations:",
+      'not all expectations were satisfied',
+      'unsatisfied expectations:',
       "- expected exactly once, not yet invoked: #{object.mocha_inspect}.expected(any_parameters)"
     ], test_result.failure_message_lines
   end
@@ -169,6 +170,7 @@ module SharedTests
     assert_failed(test_result)
     exception = test_result.errors.first.exception
     assert_equal execution_point, ExecutionPoint.new(exception.backtrace)
-    assert_match %r{undefined method `foo'}, exception.message
+    assert_match(/undefined method `foo'/, exception.message)
   end
+  # rubocop:enable Style/Semicolon
 end

data/test/integration/test_unit_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../test_helper', __FILE__)
 
-require "mocha/test_unit"
-require "integration/shared_tests"
+require 'mocha/test_unit'
+require 'integration/shared_tests'
 
 class TestUnitTest < Mocha::TestCase
   include SharedTests

data/test/method_definer.rb

@@ -1,14 +1,13 @@
 require 'metaclass'
 
 module Mocha
-
   module ObjectMethods
     def define_instance_method(method_symbol, &block)
       __metaclass__.send(:define_method, method_symbol, block)
     end
 
     def replace_instance_method(method_symbol, &block)
-      raise "Cannot replace #{method_symbol} as #{self} does not respond to it." unless self.respond_to?(method_symbol)
+      raise "Cannot replace #{method_symbol} as #{self} does not respond to it." unless respond_to?(method_symbol)
       define_instance_method(method_symbol, &block)
     end
 
@@ -16,7 +15,6 @@ module Mocha
       symbols.each { |symbol| __metaclass__.send(:attr_accessor, symbol) }
     end
   end
-
 end
 
 class Object