Skip to content

Commit b4cef58

Browse files
committed
Correct tests since reflections changes
1 parent 8102296 commit b4cef58

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

test/serializers/reflection_test.rb

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ def test_reflection_value
3636

3737
# Assert
3838
assert_nil reflection.block
39-
assert_equal Serializer.config.include_data_default, reflection.instance_variable_get(:@_include_data)
40-
assert_equal true, reflection.instance_variable_get(:@_include_data)
39+
assert_equal Serializer.config.include_data_default, reflection.options.fetch(:include_data_setting)
40+
assert_equal true, reflection.options.fetch(:include_data_setting)
4141

4242
include_slice = :does_not_matter
4343
assert_equal @model.blog, reflection.value(serializer_instance, include_slice)
@@ -56,8 +56,8 @@ def test_reflection_value_block
5656

5757
# Assert
5858
assert_respond_to reflection.block, :call
59-
assert_equal Serializer.config.include_data_default, reflection.instance_variable_get(:@_include_data)
60-
assert_equal true, reflection.instance_variable_get(:@_include_data)
59+
assert_equal Serializer.config.include_data_default, reflection.options.fetch(:include_data_setting)
60+
assert_equal true, reflection.options.fetch(:include_data_setting)
6161

6262
include_slice = :does_not_matter
6363
assert_equal @model.blog, reflection.value(serializer_instance, include_slice)
@@ -77,8 +77,8 @@ def test_reflection_value_block_with_explicit_include_data_true
7777

7878
# Assert
7979
assert_respond_to reflection.block, :call
80-
assert_equal Serializer.config.include_data_default, reflection.instance_variable_get(:@_include_data)
81-
assert_equal true, reflection.instance_variable_get(:@_include_data)
80+
assert_equal Serializer.config.include_data_default, reflection.options.fetch(:include_data_setting)
81+
assert_equal true, reflection.options.fetch(:include_data_setting)
8282

8383
include_slice = :does_not_matter
8484
assert_equal @model.blog, reflection.value(serializer_instance, include_slice)
@@ -98,10 +98,10 @@ def test_reflection_value_block_with_include_data_false_mutates_the_reflection_i
9898

9999
# Assert
100100
assert_respond_to reflection.block, :call
101-
assert_equal true, reflection.instance_variable_get(:@_include_data)
101+
assert_equal true, reflection.options.fetch(:include_data_setting)
102102
include_slice = :does_not_matter
103103
assert_nil reflection.value(serializer_instance, include_slice)
104-
assert_equal false, reflection.instance_variable_get(:@_include_data)
104+
assert_equal false, reflection.options.fetch(:include_data_setting)
105105
end
106106

107107
def test_reflection_value_block_with_include_data_if_sideloaded_included_mutates_the_reflection_include_data
@@ -118,10 +118,10 @@ def test_reflection_value_block_with_include_data_if_sideloaded_included_mutates
118118

119119
# Assert
120120
assert_respond_to reflection.block, :call
121-
assert_equal true, reflection.instance_variable_get(:@_include_data)
121+
assert_equal true, reflection.options.fetch(:include_data_setting)
122122
include_slice = {}
123123
assert_nil reflection.value(serializer_instance, include_slice)
124-
assert_equal :if_sideloaded, reflection.instance_variable_get(:@_include_data)
124+
assert_equal :if_sideloaded, reflection.options.fetch(:include_data_setting)
125125
end
126126

127127
def test_reflection_value_block_with_include_data_if_sideloaded_excluded_mutates_the_reflection_include_data
@@ -138,10 +138,10 @@ def test_reflection_value_block_with_include_data_if_sideloaded_excluded_mutates
138138

139139
# Assert
140140
assert_respond_to reflection.block, :call
141-
assert_equal true, reflection.instance_variable_get(:@_include_data)
141+
assert_equal true, reflection.options.fetch(:include_data_setting)
142142
include_slice = { blog: :does_not_matter }
143143
assert_equal @model.blog, reflection.value(serializer_instance, include_slice)
144-
assert_equal :if_sideloaded, reflection.instance_variable_get(:@_include_data)
144+
assert_equal :if_sideloaded, reflection.options.fetch(:include_data_setting)
145145
end
146146

147147
def test_reflection_block_with_link_mutates_the_reflection_links

0 commit comments

Comments
 (0)