diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-08-15 17:01:48 +0000 |
---|---|---|
committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-08-16 17:24:32 +0200 |
commit | 7753a0e0a48d396d5089ebe74f6880a622e5ac12 (patch) | |
tree | 13eb1f341e61daeb301fd2587ceb7770abed93a0 /spec | |
parent | ed1ff6baa7898eda26f495198be25cd6f5d67cb4 (diff) | |
download | gitlab-ce-7753a0e0a48d396d5089ebe74f6880a622e5ac12.tar.gz |
Merge branch 'issue_31790' into 'master'
Fix API responses when dealing with txt files
Closes #31790
See merge request !13474
Diffstat (limited to 'spec')
-rw-r--r-- | spec/requests/api/files_spec.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/spec/requests/api/files_spec.rb b/spec/requests/api/files_spec.rb index 55c998b13b8..ea97c556430 100644 --- a/spec/requests/api/files_spec.rb +++ b/spec/requests/api/files_spec.rb @@ -33,6 +33,15 @@ describe API::Files do expect(Base64.decode64(json_response['content']).lines.first).to eq("require 'fileutils'\n") end + it 'returns json when file has txt extension' do + file_path = "bar%2Fbranch-test.txt" + + get api(route(file_path), current_user), params + + expect(response).to have_http_status(200) + expect(response.content_type).to eq('application/json') + end + it 'returns file by commit sha' do # This file is deleted on HEAD file_path = "files%2Fjs%2Fcommit%2Ejs%2Ecoffee" @@ -220,6 +229,7 @@ describe API::Files do post api(route("new_file_with_author%2Etxt"), user), valid_params expect(response).to have_http_status(201) + expect(response.content_type).to eq('application/json') last_commit = project.repository.commit.raw expect(last_commit.author_email).to eq(author_email) expect(last_commit.author_name).to eq(author_name) |