mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove `MethodCallAssertions` Ruby 2.7 work-around 

By dropping support for 2.7, Rails 8 will not need to work-around
positional and keyword argument splatting.
This commit is contained in:
Sean Doyle 2024-01-04 11:10:30 -05:00
parent f6f6b0542f
commit 7abaeea4d3
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
activesupport/lib/active_support/testing/method_call_assertions.rb
View File

@ -30,22 +30,8 @@ module ActiveSupport
assert_called(object, method_name, message, times: 0, &block)
end
#--
# This method is a temporary wrapper for mock.expect as part of
# the Minitest 5.16 / Ruby 3.0 kwargs transition. It can go away
# when we drop support for Ruby 2.7.
if Minitest::Mock.instance_method(:expect).parameters.map(&:first).include?(:keyrest)
def expect_called_with(mock, args, returns: false, **kwargs)
mock.expect(:call, returns, args, **kwargs)
end
else
def expect_called_with(mock, args, returns: false, **kwargs)
if !kwargs.empty?
mock.expect(:call, returns, [*args, kwargs])
else
mock.expect(:call, returns, args)
end
end
def expect_called_with(mock, args, returns: false, **kwargs)
mock.expect(:call, returns, args, **kwargs)
end
def assert_called_on_instance_of(klass, method_name, message = nil, times: 1, returns: nil)