From c1fc0e437159ac0ec893fd7c254630fb49524adc Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Fri, 23 Dec 2016 11:14:59 -0600 Subject: [PATCH] Handle different messages from different versions of JSON gem --- test/active_model_serializers/test/schema_test.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/active_model_serializers/test/schema_test.rb b/test/active_model_serializers/test/schema_test.rb index 105ac575d..d217d0064 100644 --- a/test/active_model_serializers/test/schema_test.rb +++ b/test/active_model_serializers/test/schema_test.rb @@ -115,7 +115,8 @@ def test_with_a_non_existent_file end def test_that_raises_with_a_invalid_json_body - message = 'A JSON text must at least contain two octets!' + # message changes from JSON gem 2.0.2 to 2.2.0 + message = /A JSON text must at least contain two octets!|an unexpected token at ''/ get :invalid_json_body @@ -123,7 +124,7 @@ def test_that_raises_with_a_invalid_json_body assert_response_schema('custom/show.json') end - assert_equal(message, error.message) + assert_match(message, error.message) end end end