Ensure the response is an array.

Author: ioquatix

lib/grape/middleware/base.rb

@@ -25,7 +25,7 @@ def default_options
       end
 
       def call(env)
-        dup.call!(env)
+        dup.call!(env).to_a
       end
 
       def call!(env)

spec/grape/api_spec.rb

@@ -1903,9 +1903,9 @@ def foo
       it 'avoids polluting global namespace' do
         env = Rack::MockRequest.env_for('/')
 
-        expect(a.call(env)[2].body).to eq(['foo'])
-        expect(b.call(env)[2].body).to eq(['bar'])
-        expect(a.call(env)[2].body).to eq(['foo'])
+        expect(a.call(env)[2]).to eq(['foo'])
+        expect(b.call(env)[2]).to eq(['bar'])
+        expect(a.call(env)[2]).to eq(['foo'])
       end
     end
 

spec/grape/endpoint_spec.rb

@@ -151,7 +151,7 @@ def app
     it 'includes headers passed as symbols' do
       env = Rack::MockRequest.env_for('/headers')
       env['HTTP_SYMBOL_HEADER'.to_sym] = 'Goliath passes symbols'
-      body = subject.call(env)[2].body.first
+      body = subject.call(env)[2].first
       expect(JSON.parse(body)['Symbol-Header']).to eq('Goliath passes symbols')
     end
   end

spec/grape/integration/rack_spec.rb

@@ -21,7 +21,7 @@
       }
       env = Rack::MockRequest.env_for('/', options)
 
-      expect(JSON.parse(app.call(env)[2].body.first)['params_keys']).to match_array('test')
+      expect(JSON.parse(app.call(env)[2].first)['params_keys']).to match_array('test')
     ensure
       input.close
       input.unlink

spec/grape/middleware/formatter_spec.rb

@@ -196,19 +196,19 @@ def to_xml
       subject.options[:content_types][:custom] = "don't care"
       subject.options[:formatters][:custom] = ->(_obj, _env) { 'CUSTOM FORMAT' }
       _, _, body = subject.call('PATH_INFO' => '/info.custom')
-      expect(body.body).to eq(['CUSTOM FORMAT'])
+      expect(body).to eq(['CUSTOM FORMAT'])
     end
     context 'default' do
       let(:body) { ['blah'] }
       it 'uses default json formatter' do
         _, _, body = subject.call('PATH_INFO' => '/info.json')
-        expect(body.body).to eq(['["blah"]'])
+        expect(body).to eq(['["blah"]'])
       end
     end
     it 'uses custom json formatter' do
       subject.options[:formatters][:json] = ->(_obj, _env) { 'CUSTOM JSON FORMAT' }
       _, _, body = subject.call('PATH_INFO' => '/info.json')
-      expect(body.body).to eq(['CUSTOM JSON FORMAT'])
+      expect(body).to eq(['CUSTOM JSON FORMAT'])
     end
   end
 
@@ -384,7 +384,7 @@ def to_xml
 
     it 'returns Grape::Uril::SendFileReponse' do
       env = { 'PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/json' }
-      expect(subject.call(env)).to be_a(Grape::ServeFile::SendfileResponse)
+      expect(subject.call(env)).to be_a(Array)
     end
   end
 
@@ -407,7 +407,7 @@ def self.call(_, _)
     it 'returns response by invalid formatter' do
       env = { 'PATH_INFO' => '/hello.invalid', 'HTTP_ACCEPT' => 'application/x-invalid' }
       _, _, bodies = *subject.call(env)
-      expect(bodies.body.first).to eq({ message: 'invalid' }.to_json)
+      expect(bodies.first).to eq({ message: 'invalid' }.to_json)
     end
   end