mocha 1.11.1 → 1.11.2

data/lib/mocha/parameter_matchers/has_entries.rb

@@ -22,11 +22,10 @@ module Mocha
     #   object.expects(:method_1).with(has_entries('key_1' => 1, 'key_2' => 2))
     #   object.method_1('key_1' => 1, 'key_2' => 99)
     #   # error raised, because method_1 was not called with Hash containing entries: 'key_1' => 1, 'key_2' => 2
-    # rubocop:disable Naming/PredicateName
-    def has_entries(entries)
+    #
+    def has_entries(entries) # rubocop:disable Naming/PredicateName
       HasEntries.new(entries)
     end
-    # rubocop:enable Naming/PredicateName
 
     # Parameter matcher which matches when actual parameter contains all expected +Hash+ entries.
     class HasEntries < Base

data/lib/mocha/parameter_matchers/has_entry.rb

@@ -39,8 +39,8 @@ module Mocha
     #   object.expects(:method_1).with(has_entry('key_1' => 1))
     #   object.method_1('key_1' => 2, 'key_2' => 1)
     #   # error raised, because method_1 was not called with Hash containing entry: 'key_1' => 1
-    # rubocop:disable Naming/PredicateName
-    def has_entry(*options)
+    #
+    def has_entry(*options) # rubocop:disable Naming/PredicateName
       case options.length
       when 1
         case options[0]
@@ -63,7 +63,6 @@ module Mocha
       end
       HasEntry.new(key, value)
     end
-    # rubocop:enable Naming/PredicateName
 
     # Parameter matcher which matches when actual parameter contains expected +Hash+ entry.
     class HasEntry < Base

data/lib/mocha/parameter_matchers/has_key.rb

@@ -20,11 +20,10 @@ module Mocha
     #   object.expects(:method_1).with(has_key('key_1'))
     #   object.method_1('key_2' => 2)
     #   # error raised, because method_1 was not called with Hash containing key: 'key_1'
-    # rubocop:disable Naming/PredicateName
-    def has_key(key)
+    #
+    def has_key(key) # rubocop:disable Naming/PredicateName
       HasKey.new(key)
     end
-    # rubocop:enable Naming/PredicateName
 
     # Parameter matcher which matches when actual parameter contains +Hash+ entry with expected key.
     class HasKey < Base

data/lib/mocha/parameter_matchers/has_value.rb

@@ -20,11 +20,10 @@ module Mocha
     #   object.expects(:method_1).with(has_value(1))
     #   object.method_1('key_2' => 2)
     #   # error raised, because method_1 was not called with Hash containing value: 1
-    # rubocop:disable Naming/PredicateName
-    def has_value(value)
+    #
+    def has_value(value) # rubocop:disable Naming/PredicateName
       HasValue.new(value)
     end
-    # rubocop:enable Naming/PredicateName
 
     # Parameter matcher which matches when actual parameter contains +Hash+ entry with expected value.
     class HasValue < Base

data/lib/mocha/parameter_matchers/is_a.rb

@@ -21,11 +21,10 @@ module Mocha
     #   object.expects(:method_1).with(is_a(Integer))
     #   object.method_1('string')
     #   # error raised, because method_1 was not called with an Integer
-    # rubocop:disable Naming/PredicateName
-    def is_a(klass)
+    #
+    def is_a(klass) # rubocop:disable Naming/PredicateName
       IsA.new(klass)
     end
-    # rubocop:enable Naming/PredicateName
 
     # Parameter matcher which matches when actual parameter is a specific class.
     class IsA < Base

data/lib/mocha/parameter_matchers/not.rb

@@ -20,11 +20,10 @@ module Mocha
     #   object.expects(:method_1).with(Not(includes(1)))
     #   object.method_1([0, 1, 2, 3])
     #   # error raised, because method_1 was not called with object not including 1
-    # rubocop:disable Naming/MethodName
-    def Not(matcher)
+    #
+    def Not(matcher) # rubocop:disable Naming/MethodName
       Not.new(matcher)
     end
-    # rubocop:enable Naming/MethodName
 
     # Parameter matcher which inverts the logic of the specified matcher using a logical NOT operation.
     class Not < Base

data/lib/mocha/state_machine.rb

@@ -84,11 +84,10 @@ module Mocha
     end
 
     # Provides a mechanism to determine whether the {StateMachine} is not in the state specified by +state_name+ at some point in the future.
-    # rubocop:disable Naming/PredicateName
-    def is_not(state_name)
+    #
+    def is_not(state_name) # rubocop:disable Naming/PredicateName
       StatePredicate.new(self, state_name)
     end
-    # rubocop:enable Naming/PredicateName
 
     # @private
     def mocha_inspect

data/lib/mocha/stubbed_method.rb

@@ -74,7 +74,7 @@ module Mocha
     def restore_original_method
       return if use_prepended_module_for_stub_method?
       if stub_method_overwrites_original_method?
-        original_method_owner.send(:define_method, method_name, method_body(original_method))
+        original_method_owner.send(:define_method, method_name, method_body(@original_method))
       end
       retain_original_visibility(original_method_owner)
     end
@@ -93,18 +93,16 @@ module Mocha
     private
 
     def retain_original_visibility(method_owner)
-      return unless original_visibility
-      Module.instance_method(original_visibility).bind(method_owner).call(method_name)
+      return unless @original_visibility
+      Module.instance_method(@original_visibility).bind(method_owner).call(method_name)
     end
 
-    attr_reader :original_method, :original_visibility
-
     def store_original_method_visibility
       @original_visibility = original_method_owner.__method_visibility__(method_name)
     end
 
     def stub_method_overwrites_original_method?
-      original_method && original_method.owner == original_method_owner
+      @original_method && @original_method.owner == original_method_owner
     end
 
     def remove_original_method_from_stubbee

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = '1.11.1'.freeze
+  VERSION = '1.11.2'.freeze
 end

data/test/acceptance/issue_457_test.rb

@@ -0,0 +1,31 @@
+require File.expand_path('../acceptance_test_helper', __FILE__)
+
+class Issue457Test < Mocha::TestCase
+  include AcceptanceTest
+
+  def setup
+    setup_acceptance_test
+  end
+
+  def teardown
+    teardown_acceptance_test
+  end
+
+  def test_only_inspect_objects_when_necessary
+    test_result = run_as_test do
+      klass = Class.new do
+        def message
+          raise 'Not inspectable in this state!'
+        end
+
+        def inspect
+          message
+        end
+      end
+      instance = klass.new
+      instance.stubs(:message).returns('message')
+      assert_equal 'message', instance.inspect
+    end
+    assert_passed(test_result)
+  end
+end

data/test/acceptance/mocha_example_test.rb

@@ -1,6 +1,16 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../acceptance_test_helper', __FILE__)
 
 class MochaExampleTest < Mocha::TestCase
+  include AcceptanceTest
+
+  def setup
+    setup_acceptance_test
+  end
+
+  def teardown
+    teardown_acceptance_test
+  end
+
   class Rover
     def initialize(left_track, right_track, steps_per_metre, steps_per_degree)
       @left_track = left_track

data/test/acceptance/mock_test.rb

@@ -1,9 +1,11 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/configuration'
+require 'mocha/deprecation'
 require 'deprecation_disabler'
 
 class MockTest < Mocha::TestCase
   include AcceptanceTest
+  include Mocha
 
   def setup
     setup_acceptance_test
@@ -152,4 +154,38 @@ class MockTest < Mocha::TestCase
     end
     assert_failed(test_result)
   end
+
+  class Foo
+    class << self
+      attr_accessor :logger
+    end
+
+    def use_the_mock
+      self.class.logger.log('Foo was here')
+    end
+  end
+
+  # rubocop:disable Metrics/AbcSize
+  def test_should_display_deprecation_warning_if_mock_receives_invocations_in_another_test
+    use_mock_test_result = run_as_test do
+      Foo.logger = mock('Logger')
+      Foo.logger.expects(:log).with('Foo was here')
+      Foo.new.use_the_mock
+    end
+    assert_passed(use_mock_test_result)
+
+    reuse_mock_test_result = run_as_test do
+      DeprecationDisabler.disable_deprecations do
+        Foo.logger.expects(:log).with('Foo was here')
+        Foo.new.use_the_mock
+      end
+    end
+    assert_passed(reuse_mock_test_result)
+    assert message = Deprecation.messages.last
+    assert message.include?('#<Mock:Logger> was instantiated in one test but it is receiving invocations within another test.')
+    assert message.include?('This can lead to unintended interactions between tests and hence unexpected test failures.')
+    assert message.include?('Ensure that every test correctly cleans up any state that it introduces.')
+    assert message.include?('A Mocha::StubbingError will be raised in this scenario in the future.')
+  end
+  # rubocop:enable Metrics/AbcSize
 end

data/test/acceptance/stubba_example_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../acceptance_test_helper', __FILE__)
 
 class Widget
   def model
@@ -23,6 +23,16 @@ module Thingy
 end
 
 class StubbaExampleTest < Mocha::TestCase
+  include AcceptanceTest
+
+  def setup
+    setup_acceptance_test
+  end
+
+  def teardown
+    teardown_acceptance_test
+  end
+
   def test_should_stub_instance_method
     widget = Widget.new
     widget.expects(:model).returns('different_model')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.2
 platform: ruby
 authors:
 - James Mead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2020-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -245,7 +245,6 @@ files:
 - lib/mocha/parameter_matchers/responds_with.rb
 - lib/mocha/parameter_matchers/yaml_equivalent.rb
 - lib/mocha/parameters_matcher.rb
-- lib/mocha/pretty_parameters.rb
 - lib/mocha/raised_exception.rb
 - lib/mocha/receivers.rb
 - lib/mocha/return_values.rb
@@ -273,6 +272,7 @@ files:
 - test/acceptance/expected_invocation_count_test.rb
 - test/acceptance/failure_messages_test.rb
 - test/acceptance/issue_272_test.rb
+- test/acceptance/issue_457_test.rb
 - test/acceptance/issue_65_test.rb
 - test/acceptance/issue_70_test.rb
 - test/acceptance/mocha_example_test.rb

data/lib/mocha/pretty_parameters.rb

@@ -1,24 +0,0 @@
-require 'mocha/inspect'
-
-module Mocha
-  class PrettyParameters
-    def initialize(params)
-      @params = params
-      @params_string = params.mocha_inspect
-    end
-
-    def pretty
-      remove_outer_array_braces!
-      remove_outer_hash_braces!
-      @params_string
-    end
-
-    def remove_outer_array_braces!
-      @params_string = @params_string.gsub(/^\[|\]$/, '')
-    end
-
-    def remove_outer_hash_braces!
-      @params_string = @params_string.gsub(/^\{|\}$/, '') if @params.length == 1
-    end
-  end
-end