X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/927524f1be454de021180b74999d682780b8cb6b..442d78e1fb39f5d18f728f083e04f320ced44ebb:/services/api/test/test_helper.rb?ds=sidebyside diff --git a/services/api/test/test_helper.rb b/services/api/test/test_helper.rb index 843d4f1b23..0255d8907d 100644 --- a/services/api/test/test_helper.rb +++ b/services/api/test/test_helper.rb @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: AGPL-3.0 -require 'update_permissions' +require_relative '../lib/update_permissions' ENV["RAILS_ENV"] = "test" unless ENV["NO_COVERAGE_TEST"] @@ -179,21 +179,21 @@ class ActionController::TestCase end [:get, :post, :put, :patch, :delete].each do |method| - define_method method do |action, *args| + define_method method do |action, **kwargs| check_counter action # After Rails 5.0 upgrade, some params don't get properly serialized. # One case are filters: [['attr', 'op', 'val']] become [['attr'], ['op'], ['val']] # if not passed upstream as a JSON string. - if args[0].is_a?(Hash) && args[0][:params].is_a?(Hash) - args[0][:params].each do |key, _| + if kwargs[:params].is_a?(Hash) + kwargs[:params].each do |key, _| next if key == :exclude_script_versions # Job Reuse tests # Keys could be: :filters, :where, etc - if [Array, Hash].include?(args[0][:params][key].class) - args[0][:params][key] = SafeJSON.dump(args[0][:params][key]) + if [Array, Hash].include?(kwargs[:params][key].class) + kwargs[:params][key] = SafeJSON.dump(kwargs[:params][key]) end end end - super action, *args + super action, **kwargs end end