Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Javier López <fjlopez@gitlab.com>2019-01-10 15:30:19 +0300
committerNick Thomas <nick@gitlab.com>2019-01-10 15:30:19 +0300
commit40887a94bda88b184491a3182f08eb86cf1aeb4d (patch)
treebbc4a525aa6b8e0f95ca94948f3f5da0f5f0aeac /spec/requests/api
parent0bbdbd55607a65361570fb3072664ec8a7b6cb23 (diff)
Fix files/blob api endpoint content disposition
Diffstat (limited to 'spec/requests/api')
-rw-r--r--spec/requests/api/files_spec.rb5
-rw-r--r--spec/requests/api/repositories_spec.rb5
2 files changed, 6 insertions, 4 deletions
diff --git a/spec/requests/api/files_spec.rb b/spec/requests/api/files_spec.rb
index a0aee937185..9b32dc78274 100644
--- a/spec/requests/api/files_spec.rb
+++ b/spec/requests/api/files_spec.rb
@@ -183,14 +183,15 @@ describe API::Files do
get api(url, current_user), params: params
expect(response).to have_gitlab_http_status(200)
+ expect(headers[Gitlab::Workhorse::DETECT_HEADER]).to eq "true"
end
- it 'forces attachment content disposition' do
+ it 'sets inline content disposition by default' do
url = route(file_path) + "/raw"
get api(url, current_user), params: params
- expect(headers['Content-Disposition']).to eq('attachment; filename="popen.rb"')
+ expect(headers['Content-Disposition']).to eq('inline; filename="popen.rb"')
end
context 'when mandatory params are not given' do
diff --git a/spec/requests/api/repositories_spec.rb b/spec/requests/api/repositories_spec.rb
index b6b57803a6a..0adc95cfbeb 100644
--- a/spec/requests/api/repositories_spec.rb
+++ b/spec/requests/api/repositories_spec.rb
@@ -166,12 +166,13 @@ describe API::Repositories do
get api(route, current_user)
expect(response).to have_gitlab_http_status(200)
+ expect(headers[Gitlab::Workhorse::DETECT_HEADER]).to eq "true"
end
- it 'forces attachment content disposition' do
+ it 'sets inline content disposition by default' do
get api(route, current_user)
- expect(headers['Content-Disposition']).to eq 'attachment'
+ expect(headers['Content-Disposition']).to eq 'inline'
end
context 'when sha does not exist' do