Skip to content

Commit

Permalink
Support default json decoder even when nil responds to :load (#1563)
Browse files Browse the repository at this point in the history
In Rails (some versions at least), nil responds to `:load` (via ActiveSupport::Dependencies::Loadable mixin).
Enable default json decoder to work in this case
  • Loading branch information
gtmax authored Jun 5, 2024
1 parent 6933e9b commit 04515f3
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/faraday/response/json.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ def process_parser_options
@decoder_options =
if @decoder_options.is_a?(Array) && @decoder_options.size >= 2
@decoder_options.slice(0, 2)
elsif @decoder_options.respond_to?(:load)
elsif @decoder_options&.respond_to?(:load) # rubocop:disable Lint/RedundantSafeNavigation
# In some versions of Rails, `nil` responds to `load` - hence the safe navigation check above
[@decoder_options, :load]
else
[::JSON, :parse]
Expand Down
17 changes: 17 additions & 0 deletions spec/faraday/response/json_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,23 @@ def process(body, content_type = 'application/json', options = {})
response = process(body)
expect(response.body).to eq(result)
end

it 'passes relevant options to JSON parse even when nil responds to :load' do
original_allow_message_expectations_on_nil = RSpec::Mocks.configuration.allow_message_expectations_on_nil
RSpec::Mocks.configuration.allow_message_expectations_on_nil = true
allow(nil).to receive(:respond_to?)
.with(:load)
.and_return(true)

expect(JSON).to receive(:parse)
.with(body, { symbolize_names: true })
.and_return(result)

response = process(body)
expect(response.body).to eq(result)
ensure
RSpec::Mocks.configuration.allow_message_expectations_on_nil = original_allow_message_expectations_on_nil
end
end
end
end

0 comments on commit 04515f3

Please sign in to comment.