diff options
author | James Lopez <james@jameslopez.es> | 2018-10-23 17:19:43 +0300 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2018-10-23 17:22:23 +0300 |
commit | 0b93f8cddedc3d2baea84b7694ecbd1aa3fcaa99 (patch) | |
tree | 01d03fc3e0759c99e77e0061a9ffdf9b2415db69 /spec/controllers/uploads_controller_spec.rb | |
parent | 782badd0a2cd00d2a9cbe591e78b30aca32e252b (diff) |
Fix spec for Rails 5
Diffstat (limited to 'spec/controllers/uploads_controller_spec.rb')
-rw-r--r-- | spec/controllers/uploads_controller_spec.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb index f7af482b508..6420b70a54f 100644 --- a/spec/controllers/uploads_controller_spec.rb +++ b/spec/controllers/uploads_controller_spec.rb @@ -8,7 +8,11 @@ end shared_examples 'content not cached without revalidation and no-store' do it 'ensures content will not be cached without revalidation' do # Fixed in newer versions of ActivePack, it will only output a single `private`. - expect(subject['Cache-Control']).to eq('max-age=0, private, must-revalidate, private, no-store') + if Gitlab.rails5? + expect(subject['Cache-Control']).to eq('max-age=0, private, must-revalidate, no-store') + else + expect(subject['Cache-Control']).to eq('max-age=0, private, must-revalidate, private, no-store') + end end end |