mocha 1.11.1 → 1.11.2

data/docs/Mocha/ParameterMatchers/RegexpMatches.html

@@ -6,7 +6,7 @@
 <title>
   Class: Mocha::ParameterMatchers::RegexpMatches
   
-    &mdash; Mocha 1.11.1
+    &mdash; Mocha 1.11.2
   
 </title>
 
@@ -143,7 +143,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 17 12:49:36 2019 by
+  Generated on Sat Jan  4 17:36:48 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.5).
 </div>

data/docs/Mocha/ParameterMatchers/RespondsWith.html

@@ -6,7 +6,7 @@
 <title>
   Class: Mocha::ParameterMatchers::RespondsWith
   
-    &mdash; Mocha 1.11.1
+    &mdash; Mocha 1.11.2
   
 </title>
 
@@ -143,7 +143,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 17 12:49:36 2019 by
+  Generated on Sat Jan  4 17:36:48 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.5).
 </div>

data/docs/Mocha/ParameterMatchers/YamlEquivalent.html

@@ -6,7 +6,7 @@
 <title>
   Class: Mocha::ParameterMatchers::YamlEquivalent
   
-    &mdash; Mocha 1.11.1
+    &mdash; Mocha 1.11.2
   
 </title>
 
@@ -143,7 +143,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 17 12:49:36 2019 by
+  Generated on Sat Jan  4 17:36:48 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.5).
 </div>

data/docs/Mocha/Sequence.html

@@ -6,7 +6,7 @@
 <title>
   Class: Mocha::Sequence
   
-    &mdash; Mocha 1.11.1
+    &mdash; Mocha 1.11.2
   
 </title>
 
@@ -139,7 +139,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 17 12:49:36 2019 by
+  Generated on Sat Jan  4 17:36:48 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.5).
 </div>

data/docs/Mocha/StateMachine.html

@@ -6,7 +6,7 @@
 <title>
   Class: Mocha::StateMachine
   
-    &mdash; Mocha 1.11.1
+    &mdash; Mocha 1.11.2
   
 </title>
 
@@ -394,7 +394,7 @@
 </h3><div class="docstring">
   <div class="discussion">
     
-<p>Provides a mechanism to determine whether the <span class='object_link'><a href="" title="Mocha::StateMachine (class)">Mocha::StateMachine</a></span> is not in the state specified by <code>state_name</code> at some point in the future. rubocop:disable Naming/PredicateName</p>
+<p>Provides a mechanism to determine whether the <span class='object_link'><a href="" title="Mocha::StateMachine (class)">Mocha::StateMachine</a></span> is not in the state specified by <code>state_name</code> at some point in the future.</p>
 
 
   </div>
@@ -415,8 +415,8 @@
     <td>
       <pre class="code"><span class="info file"># File 'lib/mocha/state_machine.rb', line 88</span>
 
-<span class='kw'>def</span> <span class='id identifier rubyid_is_not'>is_not</span><span class='lparen'>(</span><span class='id identifier rubyid_state_name'>state_name</span><span class='rparen'>)</span>
-  <span class='const'><span class='object_link'><a href="StateMachine/StatePredicate.html" title="Mocha::StateMachine::StatePredicate (class)">StatePredicate</a></span></span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='kw'>self</span><span class='comma'>,</span> <span class='id identifier rubyid_state_name'>state_name</span><span class='rparen'>)</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_is_not'>is_not</span><span class='lparen'>(</span><span class='id identifier rubyid_state_name'>state_name</span><span class='rparen'>)</span> <span class='comment'># rubocop:disable Naming/PredicateName
+</span>  <span class='const'><span class='object_link'><a href="StateMachine/StatePredicate.html" title="Mocha::StateMachine::StatePredicate (class)">StatePredicate</a></span></span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='kw'>self</span><span class='comma'>,</span> <span class='id identifier rubyid_state_name'>state_name</span><span class='rparen'>)</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -517,7 +517,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 17 12:49:36 2019 by
+  Generated on Sat Jan  4 17:36:48 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.5).
 </div>

data/docs/Mocha/StateMachine/State.html

@@ -6,7 +6,7 @@
 <title>
   Class: Mocha::StateMachine::State
   
-    &mdash; Mocha 1.11.1
+    &mdash; Mocha 1.11.2
   
 </title>
 
@@ -130,7 +130,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 17 12:49:36 2019 by
+  Generated on Sat Jan  4 17:36:48 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.5).
 </div>

data/docs/Mocha/StateMachine/StatePredicate.html

@@ -6,7 +6,7 @@
 <title>
   Class: Mocha::StateMachine::StatePredicate
   
-    &mdash; Mocha 1.11.1
+    &mdash; Mocha 1.11.2
   
 </title>
 
@@ -130,7 +130,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 17 12:49:36 2019 by
+  Generated on Sat Jan  4 17:36:48 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.5).
 </div>

data/docs/Mocha/StubbingError.html

@@ -6,7 +6,7 @@
 <title>
   Class: Mocha::StubbingError
   
-    &mdash; Mocha 1.11.1
+    &mdash; Mocha 1.11.2
   
 </title>
 
@@ -140,7 +140,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 17 12:49:37 2019 by
+  Generated on Sat Jan  4 17:36:48 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.5).
 </div>

data/docs/_index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>
-  Mocha 1.11.1
+  Mocha 1.11.2
   
 </title>
 
@@ -52,7 +52,7 @@
         <div class="clear"></div>
       </div>
 
-      <div id="content"><h1 class="noborder title">Mocha 1.11.1</h1>
+      <div id="content"><h1 class="noborder title">Mocha 1.11.2</h1>
 <div id="listing">
   <h1 class="alphaindex">Alphabetic Index</h1>
   
@@ -509,7 +509,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 17 12:49:34 2019 by
+  Generated on Sat Jan  4 17:36:46 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.5).
 </div>

data/docs/file.COPYING.html

@@ -6,7 +6,7 @@
 <title>
   File: COPYING
   
-    &mdash; Mocha 1.11.1
+    &mdash; Mocha 1.11.2
   
 </title>
 
@@ -71,7 +71,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 17 12:49:34 2019 by
+  Generated on Sat Jan  4 17:36:46 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.5).
 </div>

data/docs/file.MIT-LICENSE.html

@@ -6,7 +6,7 @@
 <title>
   File: MIT-LICENSE
   
-    &mdash; Mocha 1.11.1
+    &mdash; Mocha 1.11.2
   
 </title>
 
@@ -75,7 +75,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 17 12:49:34 2019 by
+  Generated on Sat Jan  4 17:36:46 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.5).
 </div>

data/docs/file.README.html

@@ -6,7 +6,7 @@
 <title>
   File: README
   
-    &mdash; Mocha 1.11.1
+    &mdash; Mocha 1.11.2
   
 </title>
 
@@ -438,7 +438,7 @@ Pushed mocha 1.2.0 to rubygems.org.
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 17 12:49:34 2019 by
+  Generated on Sat Jan  4 17:36:46 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.5).
 </div>

data/docs/file.RELEASE.html

@@ -6,7 +6,7 @@
 <title>
   File: RELEASE
   
-    &mdash; Mocha 1.11.1
+    &mdash; Mocha 1.11.2
   
 </title>
 
@@ -59,6 +59,24 @@
 
       <div id="content"><div id='filecontents'><h1>Release Notes</h1>
 
+<h2>1.11.2</h2>
+
+<h3>External changes</h3>
+
+<ul>
+<li>Fix regression introduced in v1.10.0 that meant <code>Object#inspect</code> was called unnecessarily (368abd98)</li>
+<li>Warn when mock object receives invocations in another test - thanks to @nitishr (#442)</li>
+<li>Avoid rubocop comments appearing in YARD-generated docs (d8019eed)</li>
+</ul>
+
+<h3>Internal changes</h3>
+
+<ul>
+<li>Replace <code>StubbedMethod#original_method</code> &amp; <code>#original_visibility</code> attribute reader methods with instance variables - thanks to @nitishr (d917f332)</li>
+<li>Set up <code>MochaExampleTest</code> &amp; <code>StubbaExampleTest</code> as acceptance tests - thanks to @nitishr (4881cc58)</li>
+<li>Delete unused <code>PrettyParameters</code> class - thanks to @nitishr (314ea922)</li>
+</ul>
+
 <h2>1.11.1</h2>
 
 <h3>External changes</h3>
@@ -1000,7 +1018,7 @@ Hash with wrong number of entries.</li>
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 17 12:49:34 2019 by
+  Generated on Sat Jan  4 17:36:46 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.5).
 </div>

data/docs/frames.html

@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-	<title>Mocha 1.11.1</title>
+	<title>Mocha 1.11.2</title>
 </head>
 <script type="text/javascript" charset="utf-8">
   var match = unescape(window.location.hash).match(/^#!(.+)/);

data/docs/index.html

@@ -6,7 +6,7 @@
 <title>
   File: README
   
-    &mdash; Mocha 1.11.1
+    &mdash; Mocha 1.11.2
   
 </title>
 
@@ -438,7 +438,7 @@ Pushed mocha 1.2.0 to rubygems.org.
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 17 12:49:34 2019 by
+  Generated on Sat Jan  4 17:36:46 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.5).
 </div>

data/docs/top-level-namespace.html

@@ -6,7 +6,7 @@
 <title>
   Top Level Namespace
   
-    &mdash; Mocha 1.11.1
+    &mdash; Mocha 1.11.2
   
 </title>
 
@@ -108,7 +108,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 17 12:49:34 2019 by
+  Generated on Sat Jan  4 17:36:46 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.5).
 </div>

data/lib/mocha/api.rb

@@ -65,8 +65,8 @@ module Mocha
     #     assert motor.stop
     #     # an error will be raised unless both Motor#start and Motor#stop have been called
     #   end
-    # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
-    def mock(*arguments)
+    #
+    def mock(*arguments) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
       if Mocha.configuration.reinstate_undocumented_behaviour_from_v1_9?
         if arguments.first.is_a?(Symbol)
           method_name = arguments[0]
@@ -91,7 +91,6 @@ module Mocha
       mock.expects(expectations)
       mock
     end
-    # rubocop:enable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
 
     # Builds a new mock object
     #

data/lib/mocha/mock.rb

@@ -275,6 +275,7 @@ module Mocha
       @everything_stubbed = false
       @responder = nil
       @unexpected_invocation = nil
+      @expired = false
     end
 
     # @private
@@ -305,26 +306,16 @@ module Mocha
     end
 
     # @private
-    # rubocop:disable Style/MethodMissingSuper,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
-    def method_missing(symbol, *arguments, &block)
-      if @responder && !@responder.respond_to?(symbol)
-        raise NoMethodError, "undefined method `#{symbol}' for #{mocha_inspect} which responds like #{@responder.mocha_inspect}"
-      end
+    def method_missing(symbol, *arguments, &block) # rubocop:disable Style/MethodMissingSuper
+      check_expiry
+      check_responder_responds_to(symbol)
       invocation = Invocation.new(self, symbol, *arguments, &block)
       if (matching_expectation_allowing_invocation = all_expectations.match_allowing_invocation(invocation))
         matching_expectation_allowing_invocation.invoke(invocation)
       elsif (matching_expectation = all_expectations.match(invocation)) || (!matching_expectation && !@everything_stubbed)
-        if @unexpected_invocation.nil?
-          @unexpected_invocation = invocation
-          matching_expectation.invoke(invocation) if matching_expectation
-          message = "#{@unexpected_invocation.call_description}\n#{@mockery.mocha_inspect}"
-        else
-          message = @unexpected_invocation.short_call_description
-        end
-        raise ExpectationErrorFactory.build("unexpected invocation: #{message}", caller)
+        raise_unexpected_invocation_error(invocation, matching_expectation)
       end
     end
-    # rubocop:enable Style/MethodMissingSuper,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
 
     # @private
     def respond_to_missing?(symbol, include_private = false)
@@ -351,6 +342,11 @@ module Mocha
       @expectations.verified?(assertion_counter)
     end
 
+    # @private
+    def __expire__
+      @expired = true
+    end
+
     # @private
     def mocha_inspect
       @name.mocha_inspect
@@ -370,5 +366,35 @@ module Mocha
     def any_expectations?
       @expectations.any?
     end
+
+    private
+
+    def raise_unexpected_invocation_error(invocation, matching_expectation)
+      if @unexpected_invocation.nil?
+        @unexpected_invocation = invocation
+        matching_expectation.invoke(invocation) if matching_expectation
+        message = "#{@unexpected_invocation.call_description}\n#{@mockery.mocha_inspect}"
+      else
+        message = @unexpected_invocation.short_call_description
+      end
+      raise ExpectationErrorFactory.build("unexpected invocation: #{message}", caller)
+    end
+
+    def check_responder_responds_to(symbol)
+      if @responder && !@responder.respond_to?(symbol) # rubocop:disable Style/GuardClause
+        raise NoMethodError, "undefined method `#{symbol}' for #{mocha_inspect} which responds like #{@responder.mocha_inspect}"
+      end
+    end
+
+    def check_expiry
+      if @expired # rubocop:disable Style/GuardClause
+        Deprecation.warning(
+          "#{mocha_inspect} was instantiated in one test but it is receiving invocations within another test.",
+          ' This can lead to unintended interactions between tests and hence unexpected test failures.',
+          ' Ensure that every test correctly cleans up any state that it introduces.',
+          ' A Mocha::StubbingError will be raised in this scenario in the future.'
+        )
+      end
+    end
   end
 end

data/lib/mocha/mockery.rb

@@ -102,6 +102,7 @@ module Mocha
 
     def teardown
       stubba.unstub_all
+      mocks.each(&:__expire__)
       reset
     end
 
@@ -127,19 +128,20 @@ module Mocha
 
     def on_stubbing(object, method)
       method = PRE_RUBY_V19 ? method.to_s : method.to_sym
-      method_signature = "#{object.mocha_inspect}.#{method}"
-      check(:stubbing_non_existent_method, 'non-existent method', method_signature) do
+      signature_proc = lambda { "#{object.mocha_inspect}.#{method}" }
+      check(:stubbing_non_existent_method, 'non-existent method', signature_proc) do
         !(object.stubba_class.__method_exists__?(method, true) || object.respond_to?(method.to_sym))
       end
-      check(:stubbing_non_public_method, 'non-public method', method_signature) do
+      check(:stubbing_non_public_method, 'non-public method', signature_proc) do
         object.stubba_class.__method_exists__?(method, false)
       end
-      check(:stubbing_method_on_nil, 'method on nil', method_signature) { object.nil? }
-      check(:stubbing_method_on_non_mock_object, 'method on non-mock object', method_signature)
+      check(:stubbing_method_on_nil, 'method on nil', signature_proc) { object.nil? }
+      check(:stubbing_method_on_non_mock_object, 'method on non-mock object', signature_proc)
     end
 
     def on_stubbing_method_unnecessarily(expectation)
-      check(:stubbing_method_unnecessarily, 'method unnecessarily', expectation.method_signature, expectation.backtrace)
+      signature_proc = lambda { expectation.method_signature }
+      check(:stubbing_method_unnecessarily, 'method unnecessarily', signature_proc, expectation.backtrace)
     end
 
     attr_writer :logger
@@ -150,9 +152,10 @@ module Mocha
 
     private
 
-    def check(action, description, method_signature, backtrace = caller)
+    def check(action, description, signature_proc, backtrace = caller)
       treatment = Mocha.configuration.send(action)
       return if (treatment == :allow) || (block_given? && !yield)
+      method_signature = signature_proc.call
       message = "stubbing #{description}: #{method_signature}"
       raise StubbingError.new(message, backtrace) if treatment == :prevent
       logger.warn(message) if treatment == :warn