From 4dfbe2747b9060ee8657bd6e187a79c374cae6cc Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Fri, 6 Jan 2017 22:49:50 -0600 Subject: [PATCH] Fix test bug found by assert_nil --- .../include_data_if_sideloaded_test.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/adapter/json_api/include_data_if_sideloaded_test.rb b/test/adapter/json_api/include_data_if_sideloaded_test.rb index aabc3bc5..b5c81869 100644 --- a/test/adapter/json_api/include_data_if_sideloaded_test.rb +++ b/test/adapter/json_api/include_data_if_sideloaded_test.rb @@ -146,25 +146,25 @@ module ActiveModel end def test_node_not_included_when_no_link - expected = nil - assert_relationship(:unlinked_tags, expected) + expected = { meta: {} } + assert_relationship(:unlinked_tags, expected, key_transform: :unaltered) end private + def assert_relationship(relationship_name, expected, opts = {}) + actual = relationship_data(relationship_name, opts) + assert_equal(expected, actual) + end + def result(opts) opts = { adapter: :json_api }.merge(opts) serializable(@author, opts).serializable_hash end - def assert_relationship(relationship_name, expected, opts = {}) + def relationship_data(relationship_name, opts = {}) hash = result(opts) - actual = hash[:data][:relationships][relationship_name] - if expected.nil? - assert_nil(actual) - else - assert_equal(expected, actual) - end + hash[:data][:relationships][relationship_name] end end end