From 1a9c62215a26359aa0785932ada32cd70eb64d3e Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Thu, 9 Jun 2016 01:29:59 -0500 Subject: [PATCH] Use with_adapter(&block) to fix failing tests I missed that the code was changing global state. --- test/grape_test.rb | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/test/grape_test.rb b/test/grape_test.rb index 91753704..2fa91806 100644 --- a/test/grape_test.rb +++ b/test/grape_test.rb @@ -136,23 +136,25 @@ class ActiveModelSerializers::GrapeTest < ActiveSupport::TestCase end def test_implicit_formatter - ActiveModel::Serializer.config.adapter = :json_api - get '/grape/render_with_implicit_formatter' - post = Models.model1 serializable_resource = serializable(post, adapter: :json_api) + with_adapter :json_api do + get '/grape/render_with_implicit_formatter' + end + assert last_response.ok? assert_equal serializable_resource.to_json, last_response.body end def test_implicit_formatter_handles_arrays - ActiveModel::Serializer.config.adapter = :json_api - get '/grape/render_array_with_implicit_formatter' - posts = Models.all serializable_resource = serializable(posts, adapter: :json_api) + with_adapter :json_api do + get '/grape/render_array_with_implicit_formatter' + end + assert last_response.ok? assert_equal serializable_resource.to_json, last_response.body ensure @@ -160,11 +162,12 @@ class ActiveModelSerializers::GrapeTest < ActiveSupport::TestCase end def test_implicit_formatter_handles_collections - ActiveModel::Serializer.config.adapter = :json_api - get '/grape/render_collection_with_implicit_formatter' - assert last_response.ok? + with_adapter :json_api do + get '/grape/render_collection_with_implicit_formatter' + end representation = JSON.parse(last_response.body) + assert last_response.ok? assert representation.include?('data') assert representation['data'].count == Models.collection_per assert representation.include?('links')