Merge pull request #1956 from ioquatix/master

Align implementation with Rack SPEC

.travis.yml

@@ -13,6 +13,10 @@ matrix:
         - bundle exec danger
     - rvm: 2.7.0
       gemfile: Gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/rack1.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/rack2-0.gemfile
     - rvm: 2.7.0
       gemfile: gemfiles/rack_edge.gemfile
     - rvm: 2.7.0

gemfiles/rack1.gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+eval_gemfile('../Gemfile')
+
+gem 'rack', '~> 1.0'

gemfiles/rack2-0.gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+eval_gemfile('../Gemfile')
+
+gem 'rack', '~> 1.0'

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(read_chunks(a.call(env)[2])).to eq(['foo'])
+        expect(read_chunks(b.call(env)[2])).to eq(['bar'])
+        expect(read_chunks(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 = read_chunks(subject.call(env)[2]).join
       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(read_chunks(app.call(env)[2]).join)['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(read_chunks(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(read_chunks(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(read_chunks(body)).to eq(['CUSTOM JSON FORMAT'])
     end
   end
 
@@ -379,12 +379,17 @@ def to_xml
   end
 
   context 'send file' do
-    let(:body) { Grape::ServeFile::FileResponse.new('file') }
-    let(:app) { ->(_env) { [200, {}, body] } }
+    let(:file) { double(File) }
+    let(:file_body) { Grape::ServeFile::FileResponse.new(file) }
+    let(:app) { ->(_env) { [200, {}, file_body] } }
 
-    it 'returns Grape::Uril::SendFileReponse' do
+    it 'returns a file response' do
+      expect(file).to receive(:each).and_yield('data')
       env = { 'PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/json' }
-      expect(subject.call(env)).to be_a(Grape::ServeFile::SendfileResponse)
+      status, headers, body = subject.call(env)
+      expect(status).to be == 200
+      expect(headers).to be == { 'Content-Type' => 'application/json' }
+      expect(read_chunks(body)).to be == ['data']
     end
   end
 
@@ -406,8 +411,8 @@ 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)
+      _, _, body = *subject.call(env)
+      expect(read_chunks(body).join).to eq({ message: 'invalid' }.to_json)
     end
   end
 

spec/spec_helper.rb

@@ -18,13 +18,26 @@
 # so it should be set to true here as well to reflect that.
 I18n.enforce_available_locales = true
 
+module Chunks
+  def read_chunks(body)
+    buffer = []
+    body.each { |chunk| buffer << chunk }
+
+    buffer
+  end
+end
+
 RSpec.configure do |config|
+  config.include Chunks
   config.include Rack::Test::Methods
   config.include Spec::Support::Helpers
   config.raise_errors_for_deprecations!
   config.filter_run_when_matching :focus
 
   config.before(:each) { Grape::Util::InheritableSetting.reset_global! }
+
+  # Enable flags like --only-failures and --next-failure
+  config.example_status_persistence_file_path = '.rspec_status'
 end
 
 require 'coveralls'