Skip to content

Commit

Permalink
fix failing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
leandrocp committed Jul 25, 2015
1 parent 4f4e87b commit f610f72
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions test/array_serializer_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ def test_meta_and_meta_key_attr_readers
end

def test_links_attr_reader
@serializer = ArraySerializer.new([@comment, @post], links: {"self": "/array/1"})
@serializer = ArraySerializer.new([@comment, @post], :links => {"self" => "/array/1"})

assert_equal @serializer.links, {"self": "/array/1"}
assert_equal @serializer.links, {"self" => "/array/1"}
end

def test_root_default
Expand Down
12 changes: 6 additions & 6 deletions test/serializers/links_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ def setup
end

def test_links_is_present_with_root
serializer = AlternateBlogSerializer.new(@blog, links: {"self": "/blogs/1"})
serializer = AlternateBlogSerializer.new(@blog, :links => {"self" => "/blogs/1"})
adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
expected = {
blog: {
id: 1,
title: "AMS Hints"
},
"links" => {
self: "/blogs/1"
"self" => "/blogs/1"
}
}
assert_equal expected, adapter.as_json
end

def test_links_is_not_included_when_root_is_missing
# load_adapter uses FlattenJson Adapter
adapter = load_adapter(links: {"self": "/blogs/1"})
adapter = load_adapter(links: {"self" => "/blogs/1"})
expected = {
id: 1,
title: "AMS Hints"
Expand All @@ -37,7 +37,7 @@ def test_links_is_not_included_when_root_is_missing
end

def test_links_is_not_present_on_arrays_without_root
serializer = ArraySerializer.new([@blog], links: {"self": "/blogs/1"})
serializer = ArraySerializer.new([@blog], links: {"self" => "/blogs/1"})
# FlattenJSON doesn't have support to root
adapter = ActiveModel::Serializer::Adapter::FlattenJson.new(serializer)
expected = [{
Expand All @@ -57,7 +57,7 @@ def test_links_is_not_present_on_arrays_without_root
end

def test_links_is_present_on_arrays_with_root
serializer = ArraySerializer.new([@blog], links: {"self": "/blogs/1"})
serializer = ArraySerializer.new([@blog], links: {"self" => "/blogs/1"})
# JSON adapter adds root by default
adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
expected = {
Expand All @@ -75,7 +75,7 @@ def test_links_is_present_on_arrays_with_root
}]
}],
"links" => {
self: "/blogs/1"
"self" => "/blogs/1"
}
}
assert_equal expected, adapter.as_json
Expand Down

0 comments on commit f610f72

Please sign in to comment.