mocha 1.6.0 → 1.7.0

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

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

data/test/minitest_result.rb

@@ -1,7 +1,6 @@
 require 'forwardable'
 
 class MinitestResult
-
   class Failure
     extend Forwardable
     def_delegators :@failure, :message, :backtrace

data/test/simple_counter.rb

@@ -1,5 +1,4 @@
 class SimpleCounter
-
   attr_reader :count
 
   def initialize
@@ -9,5 +8,4 @@ class SimpleCounter
   def increment
     @count += 1
   end
-
 end

data/test/test_helper.rb

@@ -2,22 +2,26 @@ unless defined?(STANDARD_OBJECT_PUBLIC_INSTANCE_METHODS)
   STANDARD_OBJECT_PUBLIC_INSTANCE_METHODS = Object.instance_methods + Object.private_instance_methods
 end
 
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__)))
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'unit'))
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'unit', 'parameter_matchers'))
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'acceptance'))
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__)))
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), 'unit'))
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), 'unit', 'parameter_matchers'))
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), 'acceptance'))
 
 require 'mocha/detection/mini_test'
 
 begin
   require 'minitest'
+# rubocop:disable Lint/HandleExceptions
 rescue LoadError
 end
+# rubocop:enable Lint/HandleExceptions
 begin
   require 'minitest/unit'
+# rubocop:disable Lint/HandleExceptions
 rescue LoadError
 end
+# rubocop:enable Lint/HandleExceptions
 
 module Mocha; end
 
@@ -27,6 +31,7 @@ if (minitest_testcase = Mocha::Detection::MiniTest.testcase) && (ENV['MOCHA_RUN_
   rescue LoadError
     MiniTest::Unit.autorun
   end
+  # rubocop:disable Style/ClassAndModuleChildren
   class Mocha::TestCase < minitest_testcase
     def assert_nothing_raised(exception = StandardError)
       yield
@@ -39,12 +44,15 @@ if (minitest_testcase = Mocha::Detection::MiniTest.testcase) && (ENV['MOCHA_RUN_
     alias_method :assert_not_same, :refute_same
     alias_method :assert_no_match, :refute_match
   end
+  # rubocop:enable Style/ClassAndModuleChildren
 else
   require 'test/unit'
+  # rubocop:disable Style/ClassAndModuleChildren
   class Mocha::TestCase < Test::Unit::TestCase
     def test_dummy
       # Some versions (?) of Test::Unit try to run this base class as a test case
       # and it fails because it has no test methods, so I'm adding a dummy test.
     end
   end
+  # rubocop:enable Style/ClassAndModuleChildren
 end

data/test/test_runner.rb

@@ -23,9 +23,7 @@ module TestRunner
       minitest_version = Gem::Version.new(Mocha::Detection::MiniTest.version)
       if Gem::Requirement.new('>= 5.0.0').satisfied_by?(minitest_version)
         require File.expand_path('../minitest_result', __FILE__)
-        tests.each do |test|
-          test.run
-        end
+        tests.each(&:run)
         Minitest::Runnable.runnables.delete(test_class)
         test_result = MinitestResult.new(tests)
       elsif Gem::Requirement.new('> 0.0.0', '< 5.0.0').satisfied_by?(minitest_version)
@@ -53,6 +51,6 @@ module TestRunner
   end
 
   def assert_failed(test_result)
-    flunk "Test passed unexpectedly" unless test_result.failure_count + test_result.error_count > 0
+    flunk 'Test passed unexpectedly' unless test_result.failure_count + test_result.error_count > 0
   end
 end

data/test/test_unit_result.rb

@@ -6,13 +6,15 @@ class TestUnitResult
     class << test_result
       attr_reader :failures, :errors
       def failure_messages
-        failures.map { |failure| failure.message }
+        failures.map(&:message)
       end
+
       def failure_message_lines
         failure_messages.map { |message| message.split("\n") }.flatten
       end
+
       def error_messages
-        errors.map { |error| error.message }
+        errors.map(&:message)
       end
     end
     test_result

data/test/unit/any_instance_method_test.rb

@@ -4,19 +4,18 @@ require 'mocha/mock'
 require 'mocha/any_instance_method'
 
 class AnyInstanceMethodTest < Mocha::TestCase
-
   include Mocha
 
-unless RUBY_V2_PLUS
-  def test_should_hide_original_method
-    klass = Class.new { def method_x; end }
-    method = AnyInstanceMethod.new(klass, :method_x)
+  unless RUBY_V2_PLUS
+    def test_should_hide_original_method
+      klass = Class.new { def method_x; end }
+      method = AnyInstanceMethod.new(klass, :method_x)
 
-    method.hide_original_method
+      method.hide_original_method
 
-    assert_equal false, klass.method_defined?(:method_x)
+      assert_equal false, klass.method_defined?(:method_x)
+    end
   end
-end
 
   def test_should_not_raise_error_hiding_method_that_isnt_defined
     klass = Class.new
@@ -45,7 +44,11 @@ end
   end
 
   def test_should_restore_original_method
-    klass = Class.new { def method_x; :original_result; end }
+    klass = Class.new do
+      def method_x
+        :original_result
+      end
+    end
     method = AnyInstanceMethod.new(klass, :method_x)
 
     method.hide_original_method
@@ -59,7 +62,11 @@ end
   end
 
   def test_should_not_restore_original_method_if_none_was_defined_in_first_place
-    klass = Class.new { def method_x; :new_result; end }
+    klass = Class.new do
+      def method_x
+        :new_result
+      end
+    end
     method = AnyInstanceMethod.new(klass, :method_x)
 
     method.restore_original_method
@@ -75,8 +82,8 @@ end
     any_instance.stubs(:mocha).returns(any_instance_mocha)
     klass.define_instance_method(:any_instance) { any_instance }
     method = AnyInstanceMethod.new(klass, :method_x)
-    method.replace_instance_method(:restore_original_method) { }
-    method.replace_instance_method(:reset_mocha) { }
+    method.replace_instance_method(:restore_original_method) {}
+    method.replace_instance_method(:reset_mocha) {}
     method.define_instance_accessor(:remove_called)
     method.replace_instance_method(:remove_new_method) { self.remove_called = true }
 
@@ -92,8 +99,8 @@ end
     any_instance.stubs(:mocha).returns(any_instance_mocha)
     klass.define_instance_method(:any_instance) { any_instance }
     method = AnyInstanceMethod.new(klass, :method_x)
-    method.replace_instance_method(:remove_new_method) { }
-    method.replace_instance_method(:reset_mocha) { }
+    method.replace_instance_method(:remove_new_method) {}
+    method.replace_instance_method(:reset_mocha) {}
     method.define_instance_accessor(:restore_called)
     method.replace_instance_method(:restore_original_method) { self.restore_called = true }
 
@@ -107,9 +114,16 @@ end
 
     method = AnyInstanceMethod.new(klass, :method_x)
 
-    method.replace_instance_method(:remove_new_method) { }
-    method.replace_instance_method(:restore_original_method) { }
-    mocha = Class.new { class << self; attr_accessor :unstub_method; end; def self.unstub(method); self.unstub_method = method; end; }
+    method.replace_instance_method(:remove_new_method) {}
+    method.replace_instance_method(:restore_original_method) {}
+    mocha = Class.new do
+      class << self
+        attr_accessor :unstub_method
+      end
+      def self.unstub(method)
+        self.unstub_method = method
+      end
+    end
     mocha.define_instance_method(:any_expectations?) { true }
     method.replace_instance_method(:mock) { mocha }