Adjusts JsonApi adapter to serialize attributes in a nested attributes hash

This commit is contained in:
Benedikt Deicke
2015-05-21 16:23:01 +02:00
parent 5f05944826
commit ca41901fb8
11 changed files with 148 additions and 78 deletions

View File

@@ -32,10 +32,12 @@ module ActionController
expected = {
data: {
name: "Name 1",
description: "Description 1",
id: assigns(:profile).id.to_s,
type: "profiles"
type: "profiles",
attributes: {
name: "Name 1",
description: "Description 1",
}
}
}

View File

@@ -91,7 +91,7 @@ module ActionController
response = JSON.parse(@response.body)
assert response.key? 'included'
assert_equal 1, response['included'].size
assert_equal 'Steve K.', response['included'].first['name']
assert_equal 'Steve K.', response['included'].first['attributes']['name']
end
def test_render_resource_with_nested_has_many_include
@@ -101,7 +101,9 @@ module ActionController
{
"id" => "1",
"type" => "authors",
"name" => "Steve K.",
"attributes" => {
"name" => "Steve K."
},
"links" => {
"posts" => { "linkage" => [] },
"roles" => { "linkage" => [{ "type" =>"roles", "id" => "1" }, { "type" =>"roles", "id" => "2" }] },
@@ -110,18 +112,22 @@ module ActionController
}, {
"id" => "1",
"type" => "roles",
"name" => "admin",
"description" => nil,
"slug" => "admin-1",
"attributes" => {
"name" => "admin",
"description" => nil,
"slug" => "admin-1"
},
"links" => {
"author" => { "linkage" => { "type" =>"authors", "id" => "1" } }
}
}, {
"id" => "2",
"type" => "roles",
"name" => "colab",
"description" => nil,
"slug" => "colab-2",
"attributes" => {
"name" => "colab",
"description" => nil,
"slug" => "colab-2"
},
"links" => {
"author" => { "linkage" => { "type" =>"authors", "id" => "1" } }
}
@@ -135,7 +141,7 @@ module ActionController
response = JSON.parse(@response.body)
assert response.key? 'included'
assert_equal 1, response['included'].size
assert_equal 'Anonymous', response['included'].first['name']
assert_equal 'Anonymous', response['included'].first['attributes']['name']
end
def test_render_collection_without_include

View File

@@ -27,7 +27,7 @@ class DefaultScopeNameTest < ActionController::TestCase
def test_default_scope_name
get :render_new_user
assert_equal '{"data":{"admin?":false,"id":"1","type":"users"}}', @response.body
assert_equal '{"data":{"id":"1","type":"users","attributes":{"admin?":false}}}', @response.body
end
end
@@ -58,6 +58,6 @@ class SerializationScopeNameTest < ActionController::TestCase
def test_override_scope_name_with_controller
get :render_new_user
assert_equal '{"data":{"admin?":true,"id":"1","type":"users"}}', @response.body
assert_equal '{"data":{"id":"1","type":"users","attributes":{"admin?":true}}}', @response.body
end
end

View File

@@ -166,10 +166,12 @@ module ActionController
expected = {
data: {
name: "Name 1",
description: "Description 1",
id: assigns(:profile).id.to_s,
type: "profiles"
type: "profiles",
attributes: {
name: "Name 1",
description: "Description 1"
}
}
}
@@ -182,10 +184,12 @@ module ActionController
expected = {
data: {
name: "Name 1",
description: "Description 1",
id: assigns(:profile).id.to_s,
type: "profiles"
type: "profiles",
attributes: {
name: "Name 1",
description: "Description 1"
}
}
}
@@ -217,10 +221,12 @@ module ActionController
expected = {
data: [
{
name: "Name 1",
description: "Description 1",
id: assigns(:profiles).first.id.to_s,
type: "profiles"
type: "profiles",
attributes: {
name: "Name 1",
description: "Description 1"
}
}
],
meta: {