mocha 1.6.0 → 1.10.1

data/test/acceptance/throw_test.rb

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

data/test/acceptance/unexpected_invocation_test.rb

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

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class UnstubbingTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -15,7 +13,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 +28,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 +42,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 +56,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 +75,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 +90,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 +111,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 +127,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 +141,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 +157,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 +179,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

@@ -1,6 +1,7 @@
 require 'test_runner'
 require 'execution_point'
 
+# rubocop:disable Metrics/ModuleLength
 module SharedTests
   include TestRunner
 
@@ -11,6 +12,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 +26,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 +46,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, invoked never: #<Mock:expecting invocation>.expected(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -70,7 +72,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 +82,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 +100,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, invoked never: #<Mock:expecting invocation>.expected(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -111,14 +113,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 +135,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,9 +150,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: #{object.mocha_inspect}.expected(any_parameters)"
+      'not all expectations were satisfied',
+      'unsatisfied expectations:',
+      "- expected exactly once, invoked never: #{object.mocha_inspect}.expected(any_parameters)"
     ], test_result.failure_message_lines
   end
 
@@ -169,6 +171,8 @@ 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
+# rubocop:enable Metrics/ModuleLength

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,24 +1,16 @@
-require 'metaclass'
+require 'mocha/singleton_class'
 
-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)
-      define_instance_method(method_symbol, &block)
-    end
-
-    def define_instance_accessor(*symbols)
-      symbols.each { |symbol| __metaclass__.send(:attr_accessor, symbol) }
-    end
+module MethodDefiner
+  def define_instance_method(object, method_symbol, &block)
+    object.singleton_class.send(:define_method, method_symbol, block)
   end
 
-end
+  def replace_instance_method(object, method_symbol, &block)
+    raise "Cannot replace #{method_symbol} as #{self} does not respond to it." unless object.respond_to?(method_symbol)
+    define_instance_method(object, method_symbol, &block)
+  end
 
-class Object
-  include Mocha::ObjectMethods
+  def define_instance_accessor(object, *symbols)
+    symbols.each { |symbol| object.singleton_class.send(:attr_accessor, symbol) }
+  end
 end

data/test/mini_test_result.rb

@@ -2,16 +2,15 @@ require 'stringio'
 require 'minitest/unit'
 
 class MiniTestResult
-
   minitest_version = Gem::Version.new(::MiniTest::Unit::VERSION)
   if Gem::Requirement.new('<= 4.6.1').satisfied_by?(minitest_version)
-    FAILURE_PATTERN = %r{(Failure)\:\n([^\(]+)\(([^\)]+)\) \[([^\]]+)\]\:\n(.*)\n}m
-    ERROR_PATTERN   = %r{(Error)\:\n([^\(]+)\(([^\)]+)\)\:\n(.+?)\n}m
-    PATTERN_INDICES = { :method => 2, :testcase => 3 }
+    FAILURE_PATTERN = /(Failure)\:\n([^\(]+)\(([^\)]+)\) \[([^\]]+)\]\:\n(.*)\n/m
+    ERROR_PATTERN   = /(Error)\:\n([^\(]+)\(([^\)]+)\)\:\n(.+?)\n/m
+    PATTERN_INDICES = { :method => 2, :testcase => 3 }.freeze
   else
-    FAILURE_PATTERN = %r{(Failure)\:\n.([^#]+)\#([^ ]+) \[([^\]]+)\]\:\n(.*)\n}m
-    ERROR_PATTERN   = %r{(Error)\:\n.([^#]+)\#([^ ]+)\:\n(.+?)\n}m
-    PATTERN_INDICES = { :method => 3, :testcase => 2 }
+    FAILURE_PATTERN = /(Failure)\:\n.([^#]+)\#([^ ]+) \[([^\]]+)\]\:\n(.*)\n/m
+    ERROR_PATTERN   = /(Error)\:\n.([^#]+)\#([^ ]+)\:\n(.+?)\n/m
+    PATTERN_INDICES = { :method => 3, :testcase => 2 }.freeze
   end
 
   def self.parse_failure(raw)
@@ -30,7 +29,10 @@ class MiniTestResult
   class Failure
     attr_reader :method, :test_case, :location, :message
     def initialize(method, test_case, location, message)
-      @method, @test_case, @location, @message = method, test_case, location, message
+      @method = method
+      @test_case = test_case
+      @location = location
+      @message = message
     end
   end
 
@@ -38,18 +40,22 @@ class MiniTestResult
     class Exception
       attr_reader :message, :backtrace
       def initialize(message, location)
-        @message, @backtrace = message, location
+        @message = message
+        @backtrace = location
       end
     end
 
     attr_reader :method, :test_case, :exception
     def initialize(method, test_case, message, backtrace)
-      @method, @test_case, @exception = method, test_case, Exception.new(message, backtrace)
+      @method = method
+      @test_case = test_case
+      @exception = Exception.new(message, backtrace)
     end
   end
 
   def initialize(runner, tests)
-    @runner, @tests = runner, tests
+    @runner = runner
+    @tests = tests
   end
 
   def failure_count