fixup! WIP: Handle Array#flatten in Ruby v2.0-v2.2

freerange · Dec 28, 2022 · fce1211 · fce1211
1 parent 43aa8a2
commit fce1211
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/mocha/mock.rb b/lib/mocha/mock.rb
@@ -382,9 +382,13 @@ def raise_unexpected_invocation_error(invocation, matching_expectation)
     end
 
     def check_responder_responds_to(symbol)
-      if @responder && (!@responder.respond_to?(symbol, true) || (!RUBY_V23_PLUS && (symbol == :to_ary) && !@responder.respond_to?(symbol))) # rubocop:disable Style/GuardClause
-        raise NoMethodError, "undefined method `#{symbol}' for #{mocha_inspect} which responds like #{@responder.mocha_inspect}"
-      end
+      return unless @responder
+
+      legacy_behaviour_for_array_flatten = !RUBY_V23_PLUS && !@responder.respond_to?(symbol) && (symbol == :to_ary)
+
+      return if @responder.respond_to?(symbol, true) && !legacy_behaviour_for_array_flatten
+
+      raise NoMethodError, "undefined method `#{symbol}' for #{mocha_inspect} which responds like #{@responder.mocha_inspect}"
     end
 
     def check_expiry