Merge pull request #1692 from beauby/fix-jsonapi-tests

NullVoxPopuli · NullVoxPopuli · commit f0fa74328fc3 · 2016-04-20T22:15:35.000-04:00
Fix tests to comply with the JSON API spec.
diff --git a/test/adapter/json_api/has_many_test.rb b/test/adapter/json_api/has_many_test.rb
@@ -131,8 +131,9 @@ def test_has_many_with_virtual_value
               id: '1',
               type: 'virtual-values',
               relationships: {
-                maker: { data: { id: 1 } },
-                reviews: { data: [{ id: 1 }, { id: 2 }] }
+                maker: { data: { type: 'makers', id: '1' } },
+                reviews: { data: [{ type: 'reviews', id: '1' },
+                                  { type: 'reviews', id: '2' }] }
               }
             }
           }, adapter.serializable_hash)
diff --git a/test/adapter/json_api/has_one_test.rb b/test/adapter/json_api/has_one_test.rb
@@ -65,8 +65,9 @@ def test_has_one_with_virtual_value
               id: '1',
               type: 'virtual-values',
               relationships: {
-                maker: { data: { id: 1 } },
-                reviews: { data: [{ id: 1 }, { id: 2 }] }
+                maker: { data: { type: 'makers', id: '1' } },
+                reviews: { data: [{ type: 'reviews', id: '1' },
+                                  { type: 'reviews', id: '2' }] }
               }
             }
           }
diff --git a/test/fixtures/poro.rb b/test/fixtures/poro.rb
@@ -227,8 +227,9 @@ def json_key
 VirtualValueSerializer = Class.new(ActiveModel::Serializer) do
   attributes :id
 
-  has_many :reviews, virtual_value: [{ id: 1 }, { id: 2 }]
-  has_one :maker, virtual_value: { id: 1 }
+  has_many :reviews, virtual_value: [{ type: 'reviews', id: '1' },
+                                     { type: 'reviews', id: '2' }]
+  has_one :maker, virtual_value: { type: 'makers', id: '1' }
 
   def reviews
   end

Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,9 @@ def test_has_many_with_virtual_value`
`131`	`131`	`id: '1',`
`132`	`132`	`type: 'virtual-values',`
`133`	`133`	`relationships: {`
`134`		`- maker: { data: { id: 1 } },`
`135`		`- reviews: { data: [{ id: 1 }, { id: 2 }] }`
	`134`	`+ maker: { data: { type: 'makers', id: '1' } },`
	`135`	`+ reviews: { data: [{ type: 'reviews', id: '1' },`
	`136`	`+ { type: 'reviews', id: '2' }] }`
`136`	`137`	`}`
`137`	`138`	`}`
`138`	`139`	`}, adapter.serializable_hash)`
Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,9 @@ def test_has_one_with_virtual_value`
`65`	`65`	`id: '1',`
`66`	`66`	`type: 'virtual-values',`
`67`	`67`	`relationships: {`
`68`		`- maker: { data: { id: 1 } },`
`69`		`- reviews: { data: [{ id: 1 }, { id: 2 }] }`
	`68`	`+ maker: { data: { type: 'makers', id: '1' } },`
	`69`	`+ reviews: { data: [{ type: 'reviews', id: '1' },`
	`70`	`+ { type: 'reviews', id: '2' }] }`
`70`	`71`	`}`
`71`	`72`	`}`
`72`	`73`	`}`