Skip to content

Commit c1fc0e4

Browse files
committed
Handle different messages from different versions of JSON gem
1 parent 95f832f commit c1fc0e4

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

test/active_model_serializers/test/schema_test.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,16 @@ def test_with_a_non_existent_file
115115
end
116116

117117
def test_that_raises_with_a_invalid_json_body
118-
message = 'A JSON text must at least contain two octets!'
118+
# message changes from JSON gem 2.0.2 to 2.2.0
119+
message = /A JSON text must at least contain two octets!|an unexpected token at ''/
119120

120121
get :invalid_json_body
121122

122123
error = assert_raises ActiveModelSerializers::Test::Schema::InvalidSchemaError do
123124
assert_response_schema('custom/show.json')
124125
end
125126

126-
assert_equal(message, error.message)
127+
assert_match(message, error.message)
127128
end
128129
end
129130
end

0 commit comments

Comments
 (0)