diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 18:08:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 18:08:07 +0000 |
commit | 2c72daf2f1744f2b8c8c6674c266907e9ef55558 (patch) | |
tree | e489b6e87557d3f6d8a94f2e7d4d47e633d646b5 /spec/controllers/projects/wikis_controller_spec.rb | |
parent | 4e9acbfba3682c552b3de707c535e6257ef41054 (diff) | |
download | gitlab-ce-2c72daf2f1744f2b8c8c6674c266907e9ef55558.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects/wikis_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/wikis_controller_spec.rb | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/spec/controllers/projects/wikis_controller_spec.rb b/spec/controllers/projects/wikis_controller_spec.rb index 6dd050af277..99d14298cd1 100644 --- a/spec/controllers/projects/wikis_controller_spec.rb +++ b/spec/controllers/projects/wikis_controller_spec.rb @@ -144,14 +144,12 @@ describe Projects::WikisController do let(:id) { upload_file_to_wiki(project, user, file_name) } - before do - subject - end - context 'when file is an image' do let(:file_name) { 'dk.png' } it 'delivers the image' do + subject + expect(response.headers['Content-Disposition']).to match(/^inline/) expect(response.headers[Gitlab::Workhorse::DETECT_HEADER]).to eq "true" end @@ -160,19 +158,27 @@ describe Projects::WikisController do let(:file_name) { 'unsanitized.svg' } it 'delivers the image' do + subject + expect(response.headers['Content-Disposition']).to match(/^inline/) expect(response.headers[Gitlab::Workhorse::DETECT_HEADER]).to eq "true" end end + + it_behaves_like 'project cache control headers' end context 'when file is a pdf' do let(:file_name) { 'git-cheat-sheet.pdf' } it 'sets the content type to sets the content response headers' do + subject + expect(response.headers['Content-Disposition']).to match(/^inline/) expect(response.headers[Gitlab::Workhorse::DETECT_HEADER]).to eq "true" end + + it_behaves_like 'project cache control headers' end end end |