Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: rename Serializer to ActiveModelSerializers #2477

Open
wants to merge 1 commit into
base: 0-10-stable
Choose a base branch
from
Open

chore: rename Serializer to ActiveModelSerializers #2477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/active_model/serializer/reflection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class Reflection < Field
def initialize(*)
super
options[:links] = {}
options[:include_data_setting] = Serializer.config.include_data_default
options[:include_data_setting] = ActiveModelSerializers.config.include_data_default
options[:meta] = nil
@type = options.fetch(:type) do
class_name = options.fetch(:class_name, name.to_s.camelize.singularize)
Expand Down
4 changes: 2 additions & 2 deletions test/adapter/json_api/pagination_links_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,12 +226,12 @@ def test_raises_descriptive_error_when_serialization_context_unset
end

def test_pagination_links_not_present_when_disabled
ActiveModel::Serializer.config.jsonapi_pagination_links_enabled = false
ActiveModelSerializers.config.jsonapi_pagination_links_enabled = false
adapter = load_adapter(using_kaminari, mock_request)

assert_equal expected_response_without_pagination_links, adapter.serializable_hash
ensure
ActiveModel::Serializer.config.jsonapi_pagination_links_enabled = true
ActiveModelSerializers.config.jsonapi_pagination_links_enabled = true
end
end
end
Expand Down
6 changes: 3 additions & 3 deletions test/serializers/reflection_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def test_reflection_value

# Assert
assert_nil reflection.block
assert_equal Serializer.config.include_data_default, reflection.options.fetch(:include_data_setting)
assert_equal ActiveModelSerializers.config.include_data_default, reflection.options.fetch(:include_data_setting)
assert_equal true, reflection.options.fetch(:include_data_setting)

include_slice = :does_not_matter
Expand All @@ -79,7 +79,7 @@ def test_reflection_value_block

# Assert
assert_respond_to reflection.block, :call
assert_equal Serializer.config.include_data_default, reflection.options.fetch(:include_data_setting)
assert_equal ActiveModelSerializers.config.include_data_default, reflection.options.fetch(:include_data_setting)
assert_equal true, reflection.options.fetch(:include_data_setting)

include_slice = :does_not_matter
Expand All @@ -100,7 +100,7 @@ def test_reflection_value_block_with_explicit_include_data_true

# Assert
assert_respond_to reflection.block, :call
assert_equal Serializer.config.include_data_default, reflection.options.fetch(:include_data_setting)
assert_equal ActiveModelSerializers.config.include_data_default, reflection.options.fetch(:include_data_setting)
assert_equal true, reflection.options.fetch(:include_data_setting)

include_slice = :does_not_matter
Expand Down