Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rails-api/active_model_serializers
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c7bf9aa86808ad2336f4dcbd03d14bc0bc3b45a4
Choose a base ref
..
head repository: rails-api/active_model_serializers
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fdc7a9a52671bddf49dd025e2f6ff573e0ce5e4b
Choose a head ref
Showing with 2 additions and 1 deletion.
  1. +1 −0 test/adapter/json/transform_test.rb
  2. +1 −1 test/adapter/json_api/pagination_links_test.rb
1 change: 1 addition & 0 deletions test/adapter/json/transform_test.rb
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ def mock_request(key_transform = nil)
context = Minitest::Mock.new
context.expect(:request_url, URI)
context.expect(:query_parameters, {})
context.expect(:format, Mime::Type.new(:api))
options = {}
options[:key_transform] = key_transform if key_transform
options[:serialization_context] = context
2 changes: 1 addition & 1 deletion test/adapter/json_api/pagination_links_test.rb
View file
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ def mock_request(query_parameters = {}, original_url = URI)
context.expect(:request_url, original_url)
context.expect(:query_parameters, query_parameters)
context.expect(:key_transform, nil)
context.expect(:format, nil)
context.expect(:format, Mime::Type.new(:json_api))
end

def load_adapter(paginated_collection, mock_request = nil)