From 4eca03de1e7a5587d2a2d2c17c8d9e0f02084fb2 Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Wed, 24 Jan 2024 11:50:25 -0600 Subject: [PATCH 1/2] chore: fix file typo --- ...est.rb => multiple_active_relation_resource_retrieval_test.rb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/unit/resource/{multilple_active_relation_resource_retrieval_test.rb => multiple_active_relation_resource_retrieval_test.rb} (100%) diff --git a/test/unit/resource/multilple_active_relation_resource_retrieval_test.rb b/test/unit/resource/multiple_active_relation_resource_retrieval_test.rb similarity index 100% rename from test/unit/resource/multilple_active_relation_resource_retrieval_test.rb rename to test/unit/resource/multiple_active_relation_resource_retrieval_test.rb From 753ffdfc431ba4d4925b4c78c213e5e25eac303f Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Wed, 24 Jan 2024 11:52:23 -0600 Subject: [PATCH 2/2] fix: railtie to use correct load hook --- lib/jsonapi/resources/railtie.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/jsonapi/resources/railtie.rb b/lib/jsonapi/resources/railtie.rb index 43d9f5c3..10fb3c05 100644 --- a/lib/jsonapi/resources/railtie.rb +++ b/lib/jsonapi/resources/railtie.rb @@ -7,16 +7,15 @@ class Railtie < ::Rails::Railtie load 'tasks/check_upgrade.rake' end - - initializer "jsonapi_resources.testing", after: :initialize do - next unless Rails.env.test? + # https://guides.rubyonrails.org/v6.0/engines.html#available-hooks + ActiveSupport.on_load(:action_dispatch_integration_test) do # Make response.parsed_body work - ActionDispatch::IntegrationTest.register_encoder :api_json, + ::ActionDispatch::IntegrationTest.register_encoder :api_json, param_encoder: ->(params) { params }, response_parser: ->(body) { - JSONAPI::MimeTypes.parser.call(body) + ::JSONAPI::MimeTypes.parser.call(body) } end end