diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-01 18:06:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-01 18:06:21 +0300 |
commit | ded8ee5a09a1a02209adf179ac7d6e456703726a (patch) | |
tree | c56a789ac38644cb2982f3c2a8277f1e540f5913 /spec/controllers/uploads_controller_spec.rb | |
parent | deed6022efe0149d88c57ef1df736c83465643f9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/uploads_controller_spec.rb')
-rw-r--r-- | spec/controllers/uploads_controller_spec.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb index dd7ab4f9d47..1bcf3bb106b 100644 --- a/spec/controllers/uploads_controller_spec.rb +++ b/spec/controllers/uploads_controller_spec.rb @@ -7,9 +7,9 @@ shared_examples 'content 5 min private cached with revalidation' do end end -shared_examples 'content long term private cached with revalidation' do +shared_examples 'content not cached' do it 'ensures content will not be cached without revalidation' do - expect(subject['Cache-Control']).to eq('max-age=15778476, private, must-revalidate') + expect(subject['Cache-Control']).to eq('max-age=0, private, must-revalidate') end end @@ -490,7 +490,7 @@ describe UploadsController do expect(response).to have_gitlab_http_status(200) end - it_behaves_like 'content long term private cached with revalidation' do + it_behaves_like 'content not cached' do subject do get :show, params: { model: 'note', mounted_as: 'attachment', id: note.id, filename: 'dk.png' } @@ -510,7 +510,7 @@ describe UploadsController do expect(response).to have_gitlab_http_status(200) end - it_behaves_like 'content long term private cached with revalidation' do + it_behaves_like 'content not cached' do subject do get :show, params: { model: 'note', mounted_as: 'attachment', id: note.id, filename: 'dk.png' } @@ -563,7 +563,7 @@ describe UploadsController do expect(response).to have_gitlab_http_status(200) end - it_behaves_like 'content long term private cached with revalidation' do + it_behaves_like 'content not cached' do subject do get :show, params: { model: 'note', mounted_as: 'attachment', id: note.id, filename: 'dk.png' } |