Skip to content

Commit 6a447bb

Browse files
committed
Fix specs and test on rack ~> 1.0 and rack ~> 2.0.0.
1 parent 3f99242 commit 6a447bb

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ matrix:
1313
- bundle exec danger
1414
- rvm: 2.7.0
1515
gemfile: Gemfile
16+
- rvm: 2.7.0
17+
gemfile: gemfiles/rack1.gemfile
18+
- rvm: 2.7.0
19+
gemfile: gemfiles/rack2-0.gemfile
1620
- rvm: 2.7.0
1721
gemfile: gemfiles/rack_edge.gemfile
1822
- rvm: 2.7.0

gemfiles/rack1.gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
eval_gemfile("../Gemfile")
3+
4+
gem 'rack', '~> 1.0'

gemfiles/rack2-0.gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
eval_gemfile("../Gemfile")
3+
4+
gem 'rack', '~> 1.0'

spec/grape/middleware/formatter_spec.rb

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -379,12 +379,16 @@ def to_xml
379379
end
380380

381381
context 'send file' do
382-
let(:body) { Grape::ServeFile::FileResponse.new('file') }
383-
let(:app) { ->(_env) { [200, {}, body] } }
382+
let(:file) {double(File)}
383+
let(:file_body) { Grape::ServeFile::FileResponse.new(file) }
384+
let(:app) { ->(_env) { [200, {}, file_body] } }
384385

385-
it 'returns Grape::Uril::SendFileReponse' do
386+
it 'returns a file response' do
386387
env = { 'PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/json' }
387-
expect(subject.call(env)).to be_a(Array)
388+
status, headers, body = subject.call(env)
389+
expect(status).to be == 200
390+
expect(headers).to be == {"Content-Type"=>"application/json"}
391+
expect(body).to be file
388392
end
389393
end
390394

0 commit comments

Comments
 (0)