2019-10-28 20:06:10 -04:00
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2013-11-07 11:53:35 -05:00
|
|
|
require 'spec_helper'
|
|
|
|
|
2020-06-24 02:09:01 -04:00
|
|
|
RSpec.describe API::Files do
|
2020-06-21 23:08:17 -04:00
|
|
|
include RepoHelpers
|
|
|
|
|
2013-11-07 11:53:35 -05:00
|
|
|
let(:user) { create(:user) }
|
2017-01-26 18:51:57 -05:00
|
|
|
let!(:project) { create(:project, :repository, namespace: user.namespace ) }
|
|
|
|
let(:guest) { create(:user) { |u| project.add_guest(u) } }
|
2017-03-01 15:22:29 -05:00
|
|
|
let(:file_path) { "files%2Fruby%2Fpopen%2Erb" }
|
2020-02-26 16:09:11 -05:00
|
|
|
let(:rouge_file_path) { "%2e%2e%2f" }
|
2020-07-21 20:09:26 -04:00
|
|
|
let(:absolute_path) { "%2Fetc%2Fpasswd.rb" }
|
2020-02-26 16:09:11 -05:00
|
|
|
let(:invalid_file_message) { 'file_path should be a valid file path' }
|
2016-12-20 09:05:57 -05:00
|
|
|
let(:params) do
|
|
|
|
{
|
|
|
|
ref: 'master'
|
|
|
|
}
|
|
|
|
end
|
2020-08-10 23:11:00 -04:00
|
|
|
|
2017-03-23 09:08:39 -04:00
|
|
|
let(:author_email) { 'user@example.org' }
|
|
|
|
let(:author_name) { 'John Doe' }
|
2014-08-06 02:57:15 -04:00
|
|
|
|
2018-08-01 12:48:33 -04:00
|
|
|
let(:helper) do
|
|
|
|
fake_class = Class.new do
|
|
|
|
include ::API::Helpers::HeadersHelpers
|
|
|
|
|
|
|
|
attr_reader :headers
|
|
|
|
|
|
|
|
def initialize
|
|
|
|
@headers = {}
|
|
|
|
end
|
|
|
|
|
|
|
|
def header(key, value)
|
|
|
|
@headers[key] = value
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
fake_class.new
|
|
|
|
end
|
|
|
|
|
2017-06-14 14:18:56 -04:00
|
|
|
before do
|
2017-12-22 03:18:28 -05:00
|
|
|
project.add_developer(user)
|
2017-06-14 14:18:56 -04:00
|
|
|
end
|
2014-02-18 05:27:02 -05:00
|
|
|
|
2017-03-01 15:22:29 -05:00
|
|
|
def route(file_path = nil)
|
|
|
|
"/projects/#{project.id}/repository/files/#{file_path}"
|
|
|
|
end
|
2016-12-20 09:05:57 -05:00
|
|
|
|
2018-08-01 12:48:33 -04:00
|
|
|
context 'http headers' do
|
|
|
|
it 'converts value into string' do
|
|
|
|
helper.set_http_headers(test: 1)
|
|
|
|
|
|
|
|
expect(helper.headers).to eq({ 'X-Gitlab-Test' => '1' })
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'raises exception if value is an Enumerable' do
|
|
|
|
expect { helper.set_http_headers(test: [1]) }.to raise_error(ArgumentError)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-07-21 20:09:26 -04:00
|
|
|
shared_examples 'when path is absolute' do
|
|
|
|
it 'returns 400 when file path is absolute' do
|
|
|
|
subject
|
|
|
|
|
|
|
|
expect(response).to have_gitlab_http_status(:bad_request)
|
|
|
|
|
|
|
|
if response.body.present?
|
|
|
|
expect(json_response['error']).to eq(invalid_file_message)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-06-28 02:10:51 -04:00
|
|
|
describe "HEAD /projects/:id/repository/files/:file_path" do
|
|
|
|
shared_examples_for 'repository files' do
|
2020-11-03 13:09:22 -05:00
|
|
|
let(:options) { {} }
|
|
|
|
|
2020-02-26 16:09:11 -05:00
|
|
|
it 'returns 400 when file path is invalid' do
|
2020-11-03 13:09:22 -05:00
|
|
|
head api(route(rouge_file_path), current_user, **options), params: params
|
2020-02-26 16:09:11 -05:00
|
|
|
|
|
|
|
expect(response).to have_gitlab_http_status(:bad_request)
|
|
|
|
end
|
|
|
|
|
2020-07-21 20:09:26 -04:00
|
|
|
it_behaves_like 'when path is absolute' do
|
2020-11-03 13:09:22 -05:00
|
|
|
subject { head api(route(absolute_path), current_user, **options), params: params }
|
2020-07-21 20:09:26 -04:00
|
|
|
end
|
|
|
|
|
2018-06-28 02:10:51 -04:00
|
|
|
it 'returns file attributes in headers' do
|
2020-11-03 13:09:22 -05:00
|
|
|
head api(route(file_path), current_user, **options), params: params
|
2018-06-28 02:10:51 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2018-06-28 02:10:51 -04:00
|
|
|
expect(response.headers['X-Gitlab-File-Path']).to eq(CGI.unescape(file_path))
|
|
|
|
expect(response.headers['X-Gitlab-File-Name']).to eq('popen.rb')
|
|
|
|
expect(response.headers['X-Gitlab-Last-Commit-Id']).to eq('570e7b2abdd848b95f2f578043fc23bd6f6fd24d')
|
|
|
|
expect(response.headers['X-Gitlab-Content-Sha256']).to eq('c440cd09bae50c4632cc58638ad33c6aa375b6109d811e76a9cc3a613c1e8887')
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns file by commit sha' do
|
|
|
|
# This file is deleted on HEAD
|
|
|
|
file_path = "files%2Fjs%2Fcommit%2Ejs%2Ecoffee"
|
|
|
|
params[:ref] = "6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9"
|
|
|
|
|
2020-11-03 13:09:22 -05:00
|
|
|
head api(route(file_path), current_user, **options), params: params
|
2018-06-28 02:10:51 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2018-06-28 02:10:51 -04:00
|
|
|
expect(response.headers['X-Gitlab-File-Name']).to eq('commit.js.coffee')
|
|
|
|
expect(response.headers['X-Gitlab-Content-Sha256']).to eq('08785f04375b47f81f46e68cc125d5ef368aa20576ddb53f91f4d83f1d04b929')
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when mandatory params are not given' do
|
|
|
|
it "responds with a 400 status" do
|
2020-11-03 13:09:22 -05:00
|
|
|
head api(route("any%2Ffile"), current_user, **options)
|
2018-06-28 02:10:51 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:bad_request)
|
2018-06-28 02:10:51 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when file_path does not exist' do
|
|
|
|
it "responds with a 404 status" do
|
|
|
|
params[:ref] = 'master'
|
|
|
|
|
2020-11-03 13:09:22 -05:00
|
|
|
head api(route('app%2Fmodels%2Fapplication%2Erb'), current_user, **options), params: params
|
2018-06-28 02:10:51 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:not_found)
|
2018-06-28 02:10:51 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when file_path does not exist' do
|
|
|
|
include_context 'disabled repository'
|
|
|
|
|
|
|
|
it "responds with a 403 status" do
|
2020-11-03 13:09:22 -05:00
|
|
|
head api(route(file_path), current_user, **options), params: params
|
2018-06-28 02:10:51 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:forbidden)
|
2018-06-28 02:10:51 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when unauthenticated', 'and project is public' do
|
|
|
|
it_behaves_like 'repository files' do
|
|
|
|
let(:project) { create(:project, :public, :repository) }
|
|
|
|
let(:current_user) { nil }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when unauthenticated', 'and project is private' do
|
|
|
|
it "responds with a 404 status" do
|
|
|
|
current_user = nil
|
|
|
|
|
2018-12-19 14:50:20 -05:00
|
|
|
head api(route(file_path), current_user), params: params
|
2018-06-28 02:10:51 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:not_found)
|
2018-06-28 02:10:51 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-12-04 05:55:34 -05:00
|
|
|
context 'when PATs are used' do
|
|
|
|
it_behaves_like 'repository files' do
|
|
|
|
let(:token) { create(:personal_access_token, scopes: ['read_repository'], user: user) }
|
2020-11-03 13:09:22 -05:00
|
|
|
let(:current_user) { nil }
|
|
|
|
let(:options) { { personal_access_token: token } }
|
2018-12-04 05:55:34 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-06-28 02:10:51 -04:00
|
|
|
context 'when authenticated', 'as a developer' do
|
|
|
|
it_behaves_like 'repository files' do
|
|
|
|
let(:current_user) { user }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when authenticated', 'as a guest' do
|
|
|
|
it_behaves_like '403 response' do
|
2018-12-19 14:50:20 -05:00
|
|
|
let(:request) { head api(route(file_path), guest), params: params }
|
2018-06-28 02:10:51 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-03-01 15:22:29 -05:00
|
|
|
describe "GET /projects/:id/repository/files/:file_path" do
|
2016-12-16 12:58:24 -05:00
|
|
|
shared_examples_for 'repository files' do
|
2020-11-03 13:09:22 -05:00
|
|
|
let(:options) { {} }
|
2020-05-29 14:08:26 -04:00
|
|
|
|
2020-02-26 16:09:11 -05:00
|
|
|
it 'returns 400 for invalid file path' do
|
2020-11-03 13:09:22 -05:00
|
|
|
get api(route(rouge_file_path), api_user, **options), params: params
|
2020-02-26 16:09:11 -05:00
|
|
|
|
|
|
|
expect(response).to have_gitlab_http_status(:bad_request)
|
|
|
|
expect(json_response['error']).to eq(invalid_file_message)
|
|
|
|
end
|
|
|
|
|
2020-07-21 20:09:26 -04:00
|
|
|
it_behaves_like 'when path is absolute' do
|
2020-11-03 13:09:22 -05:00
|
|
|
subject { get api(route(absolute_path), api_user, **options), params: params }
|
2020-07-21 20:09:26 -04:00
|
|
|
end
|
|
|
|
|
2017-03-01 15:22:29 -05:00
|
|
|
it 'returns file attributes as json' do
|
2020-11-03 13:09:22 -05:00
|
|
|
get api(route(file_path), api_user, **options), params: params
|
2016-12-16 12:58:24 -05:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2017-03-01 15:22:29 -05:00
|
|
|
expect(json_response['file_path']).to eq(CGI.unescape(file_path))
|
2016-12-16 12:58:24 -05:00
|
|
|
expect(json_response['file_name']).to eq('popen.rb')
|
|
|
|
expect(json_response['last_commit_id']).to eq('570e7b2abdd848b95f2f578043fc23bd6f6fd24d')
|
2018-06-28 02:10:51 -04:00
|
|
|
expect(json_response['content_sha256']).to eq('c440cd09bae50c4632cc58638ad33c6aa375b6109d811e76a9cc3a613c1e8887')
|
2016-12-16 12:58:24 -05:00
|
|
|
expect(Base64.decode64(json_response['content']).lines.first).to eq("require 'fileutils'\n")
|
|
|
|
end
|
2016-12-20 09:05:57 -05:00
|
|
|
|
2017-08-10 15:16:54 -04:00
|
|
|
it 'returns json when file has txt extension' do
|
|
|
|
file_path = "bar%2Fbranch-test.txt"
|
|
|
|
|
2020-11-03 13:09:22 -05:00
|
|
|
get api(route(file_path), api_user, **options), params: params
|
2017-08-10 15:16:54 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2020-11-03 13:09:22 -05:00
|
|
|
expect(response.media_type).to eq('application/json')
|
2017-08-10 15:16:54 -04:00
|
|
|
end
|
|
|
|
|
2020-06-26 17:08:51 -04:00
|
|
|
context 'with filename with pathspec characters' do
|
2020-06-21 23:08:17 -04:00
|
|
|
let(:file_path) { ':wq' }
|
|
|
|
let(:newrev) { project.repository.commit('master').sha }
|
|
|
|
|
|
|
|
before do
|
|
|
|
create_file_in_repo(project, 'master', 'master', file_path, 'Test file')
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns JSON wth commit SHA' do
|
|
|
|
params[:ref] = 'master'
|
|
|
|
|
2020-11-03 13:09:22 -05:00
|
|
|
get api(route(file_path), api_user, **options), params: params
|
2020-06-21 23:08:17 -04:00
|
|
|
|
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
|
|
|
expect(json_response['file_path']).to eq(file_path)
|
|
|
|
expect(json_response['file_name']).to eq(file_path)
|
|
|
|
expect(json_response['last_commit_id']).to eq(newrev)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-03-07 19:14:33 -05:00
|
|
|
it 'returns file by commit sha' do
|
|
|
|
# This file is deleted on HEAD
|
|
|
|
file_path = "files%2Fjs%2Fcommit%2Ejs%2Ecoffee"
|
|
|
|
params[:ref] = "6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9"
|
|
|
|
|
2020-11-03 13:09:22 -05:00
|
|
|
get api(route(file_path), api_user, **options), params: params
|
2017-03-07 19:14:33 -05:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2017-03-07 19:14:33 -05:00
|
|
|
expect(json_response['file_name']).to eq('commit.js.coffee')
|
2018-06-28 02:10:51 -04:00
|
|
|
expect(json_response['content_sha256']).to eq('08785f04375b47f81f46e68cc125d5ef368aa20576ddb53f91f4d83f1d04b929')
|
2017-03-07 19:14:33 -05:00
|
|
|
expect(Base64.decode64(json_response['content']).lines.first).to eq("class Commit\n")
|
|
|
|
end
|
|
|
|
|
2017-03-01 15:22:29 -05:00
|
|
|
it 'returns raw file info' do
|
|
|
|
url = route(file_path) + "/raw"
|
|
|
|
expect(Gitlab::Workhorse).to receive(:send_git_blob)
|
|
|
|
|
2020-11-03 13:09:22 -05:00
|
|
|
get api(url, api_user, **options), params: params
|
2017-03-01 15:22:29 -05:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2019-01-10 07:30:19 -05:00
|
|
|
expect(headers[Gitlab::Workhorse::DETECT_HEADER]).to eq "true"
|
2017-03-01 15:22:29 -05:00
|
|
|
end
|
|
|
|
|
2019-07-04 07:59:10 -04:00
|
|
|
it 'returns blame file info' do
|
|
|
|
url = route(file_path) + '/blame'
|
|
|
|
|
2020-11-03 13:09:22 -05:00
|
|
|
get api(url, api_user, **options), params: params
|
2019-07-04 07:59:10 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2019-07-04 07:59:10 -04:00
|
|
|
end
|
|
|
|
|
2019-01-10 07:30:19 -05:00
|
|
|
it 'sets inline content disposition by default' do
|
2018-11-23 11:44:09 -05:00
|
|
|
url = route(file_path) + "/raw"
|
|
|
|
|
2020-11-03 13:09:22 -05:00
|
|
|
get api(url, api_user, **options), params: params
|
2018-11-23 11:44:09 -05:00
|
|
|
|
2019-02-04 20:27:22 -05:00
|
|
|
expect(headers['Content-Disposition']).to eq(%q(inline; filename="popen.rb"; filename*=UTF-8''popen.rb))
|
2018-11-23 11:44:09 -05:00
|
|
|
end
|
|
|
|
|
2017-03-01 15:22:29 -05:00
|
|
|
context 'when mandatory params are not given' do
|
2016-12-20 09:05:57 -05:00
|
|
|
it_behaves_like '400 response' do
|
2020-11-03 13:09:22 -05:00
|
|
|
let(:request) { get api(route("any%2Ffile"), current_user, **options) }
|
2016-12-20 09:05:57 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when file_path does not exist' do
|
2017-03-01 15:22:29 -05:00
|
|
|
let(:params) { { ref: 'master' } }
|
2016-12-20 09:05:57 -05:00
|
|
|
|
|
|
|
it_behaves_like '404 response' do
|
2020-11-03 13:09:22 -05:00
|
|
|
let(:request) { get api(route('app%2Fmodels%2Fapplication%2Erb'), api_user, **options), params: params }
|
2016-12-20 09:05:57 -05:00
|
|
|
let(:message) { '404 File Not Found' }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when repository is disabled' do
|
|
|
|
include_context 'disabled repository'
|
|
|
|
|
|
|
|
it_behaves_like '403 response' do
|
2020-11-03 13:09:22 -05:00
|
|
|
let(:request) { get api(route(file_path), api_user, **options), params: params }
|
2016-12-20 09:05:57 -05:00
|
|
|
end
|
|
|
|
end
|
2016-12-16 12:58:24 -05:00
|
|
|
end
|
|
|
|
|
2016-12-20 09:05:57 -05:00
|
|
|
context 'when unauthenticated', 'and project is public' do
|
2016-12-16 12:58:24 -05:00
|
|
|
it_behaves_like 'repository files' do
|
2017-08-01 14:51:52 -04:00
|
|
|
let(:project) { create(:project, :public, :repository) }
|
2016-12-16 12:58:24 -05:00
|
|
|
let(:current_user) { nil }
|
2020-11-03 13:09:22 -05:00
|
|
|
let(:api_user) { nil }
|
2016-12-16 12:58:24 -05:00
|
|
|
end
|
|
|
|
end
|
2016-09-08 11:40:07 -04:00
|
|
|
|
2018-12-04 05:55:34 -05:00
|
|
|
context 'when PATs are used' do
|
|
|
|
it_behaves_like 'repository files' do
|
|
|
|
let(:token) { create(:personal_access_token, scopes: ['read_repository'], user: user) }
|
2020-05-29 14:08:26 -04:00
|
|
|
let(:current_user) { user }
|
2020-11-03 13:09:22 -05:00
|
|
|
let(:api_user) { nil }
|
|
|
|
let(:options) { { personal_access_token: token } }
|
2018-12-04 05:55:34 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-12-20 09:05:57 -05:00
|
|
|
context 'when unauthenticated', 'and project is private' do
|
|
|
|
it_behaves_like '404 response' do
|
2018-12-17 17:52:17 -05:00
|
|
|
let(:request) { get api(route(file_path)), params: params }
|
2016-12-20 09:05:57 -05:00
|
|
|
let(:message) { '404 Project Not Found' }
|
2016-12-16 12:58:24 -05:00
|
|
|
end
|
2014-02-18 05:27:02 -05:00
|
|
|
end
|
|
|
|
|
2016-12-20 09:05:57 -05:00
|
|
|
context 'when authenticated', 'as a developer' do
|
|
|
|
it_behaves_like 'repository files' do
|
|
|
|
let(:current_user) { user }
|
2020-11-03 13:09:22 -05:00
|
|
|
let(:api_user) { user }
|
2016-12-20 09:05:57 -05:00
|
|
|
end
|
2014-02-18 05:27:02 -05:00
|
|
|
end
|
|
|
|
|
2016-12-20 09:05:57 -05:00
|
|
|
context 'when authenticated', 'as a guest' do
|
|
|
|
it_behaves_like '403 response' do
|
2018-12-17 17:52:17 -05:00
|
|
|
let(:request) { get api(route(file_path), guest), params: params }
|
2016-12-20 09:05:57 -05:00
|
|
|
end
|
2014-02-18 05:27:02 -05:00
|
|
|
end
|
|
|
|
end
|
2013-11-07 11:53:35 -05:00
|
|
|
|
2019-07-04 07:59:10 -04:00
|
|
|
describe 'GET /projects/:id/repository/files/:file_path/blame' do
|
|
|
|
shared_examples_for 'repository blame files' do
|
|
|
|
let(:expected_blame_range_sizes) do
|
|
|
|
[3, 2, 1, 2, 1, 1, 1, 1, 8, 1, 3, 1, 2, 1, 4, 1, 2, 2]
|
|
|
|
end
|
|
|
|
|
|
|
|
let(:expected_blame_range_commit_ids) do
|
|
|
|
%w[
|
|
|
|
913c66a37b4a45b9769037c55c2d238bd0942d2e
|
|
|
|
874797c3a73b60d2187ed6e2fcabd289ff75171e
|
|
|
|
913c66a37b4a45b9769037c55c2d238bd0942d2e
|
|
|
|
874797c3a73b60d2187ed6e2fcabd289ff75171e
|
|
|
|
570e7b2abdd848b95f2f578043fc23bd6f6fd24d
|
|
|
|
874797c3a73b60d2187ed6e2fcabd289ff75171e
|
|
|
|
913c66a37b4a45b9769037c55c2d238bd0942d2e
|
|
|
|
874797c3a73b60d2187ed6e2fcabd289ff75171e
|
|
|
|
570e7b2abdd848b95f2f578043fc23bd6f6fd24d
|
|
|
|
913c66a37b4a45b9769037c55c2d238bd0942d2e
|
|
|
|
874797c3a73b60d2187ed6e2fcabd289ff75171e
|
|
|
|
913c66a37b4a45b9769037c55c2d238bd0942d2e
|
|
|
|
874797c3a73b60d2187ed6e2fcabd289ff75171e
|
|
|
|
570e7b2abdd848b95f2f578043fc23bd6f6fd24d
|
|
|
|
874797c3a73b60d2187ed6e2fcabd289ff75171e
|
|
|
|
913c66a37b4a45b9769037c55c2d238bd0942d2e
|
|
|
|
874797c3a73b60d2187ed6e2fcabd289ff75171e
|
|
|
|
913c66a37b4a45b9769037c55c2d238bd0942d2e
|
|
|
|
]
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns file attributes in headers' do
|
|
|
|
head api(route(file_path) + '/blame', current_user), params: params
|
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2019-07-04 07:59:10 -04:00
|
|
|
expect(response.headers['X-Gitlab-File-Path']).to eq(CGI.unescape(file_path))
|
|
|
|
expect(response.headers['X-Gitlab-File-Name']).to eq('popen.rb')
|
|
|
|
expect(response.headers['X-Gitlab-Last-Commit-Id']).to eq('570e7b2abdd848b95f2f578043fc23bd6f6fd24d')
|
|
|
|
expect(response.headers['X-Gitlab-Content-Sha256'])
|
|
|
|
.to eq('c440cd09bae50c4632cc58638ad33c6aa375b6109d811e76a9cc3a613c1e8887')
|
|
|
|
end
|
|
|
|
|
2020-02-26 16:09:11 -05:00
|
|
|
it 'returns 400 when file path is invalid' do
|
|
|
|
get api(route(rouge_file_path) + '/blame', current_user), params: params
|
|
|
|
|
|
|
|
expect(response).to have_gitlab_http_status(:bad_request)
|
|
|
|
expect(json_response['error']).to eq(invalid_file_message)
|
|
|
|
end
|
|
|
|
|
2020-07-21 20:09:26 -04:00
|
|
|
it_behaves_like 'when path is absolute' do
|
|
|
|
subject { get api(route(absolute_path) + '/blame', current_user), params: params }
|
|
|
|
end
|
|
|
|
|
2019-07-04 07:59:10 -04:00
|
|
|
it 'returns blame file attributes as json' do
|
|
|
|
get api(route(file_path) + '/blame', current_user), params: params
|
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2019-07-04 07:59:10 -04:00
|
|
|
expect(json_response.map { |x| x['lines'].size }).to eq(expected_blame_range_sizes)
|
|
|
|
expect(json_response.map { |x| x['commit']['id'] }).to eq(expected_blame_range_commit_ids)
|
|
|
|
range = json_response[0]
|
|
|
|
expect(range['lines']).to eq(["require 'fileutils'", "require 'open3'", ''])
|
|
|
|
expect(range['commit']['id']).to eq('913c66a37b4a45b9769037c55c2d238bd0942d2e')
|
|
|
|
expect(range['commit']['parent_ids']).to eq(['cfe32cf61b73a0d5e9f13e774abde7ff789b1660'])
|
|
|
|
expect(range['commit']['message'])
|
|
|
|
.to eq("Files, encoding and much more\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n")
|
|
|
|
|
2019-12-03 13:06:49 -05:00
|
|
|
expect(range['commit']['authored_date']).to eq('2014-02-27T10:14:56.000+02:00')
|
2019-07-04 07:59:10 -04:00
|
|
|
expect(range['commit']['author_name']).to eq('Dmitriy Zaporozhets')
|
|
|
|
expect(range['commit']['author_email']).to eq('dmitriy.zaporozhets@gmail.com')
|
|
|
|
|
2019-12-03 13:06:49 -05:00
|
|
|
expect(range['commit']['committed_date']).to eq('2014-02-27T10:14:56.000+02:00')
|
2019-07-04 07:59:10 -04:00
|
|
|
expect(range['commit']['committer_name']).to eq('Dmitriy Zaporozhets')
|
|
|
|
expect(range['commit']['committer_email']).to eq('dmitriy.zaporozhets@gmail.com')
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns blame file info for files with dots' do
|
|
|
|
url = route('.gitignore') + '/blame'
|
|
|
|
|
|
|
|
get api(url, current_user), params: params
|
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2019-07-04 07:59:10 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns file by commit sha' do
|
|
|
|
# This file is deleted on HEAD
|
|
|
|
file_path = 'files%2Fjs%2Fcommit%2Ejs%2Ecoffee'
|
|
|
|
params[:ref] = '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9'
|
|
|
|
|
|
|
|
get api(route(file_path) + '/blame', current_user), params: params
|
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2019-07-04 07:59:10 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
context 'when mandatory params are not given' do
|
|
|
|
it_behaves_like '400 response' do
|
|
|
|
let(:request) { get api(route('any%2Ffile/blame'), current_user) }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when file_path does not exist' do
|
|
|
|
let(:params) { { ref: 'master' } }
|
|
|
|
|
|
|
|
it_behaves_like '404 response' do
|
|
|
|
let(:request) { get api(route('app%2Fmodels%2Fapplication%2Erb/blame'), current_user), params: params }
|
|
|
|
let(:message) { '404 File Not Found' }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when commit does not exist' do
|
|
|
|
let(:params) { { ref: '1111111111111111111111111111111111111111' } }
|
|
|
|
|
|
|
|
it_behaves_like '404 response' do
|
|
|
|
let(:request) { get api(route(file_path + '/blame'), current_user), params: params }
|
|
|
|
let(:message) { '404 Commit Not Found' }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when repository is disabled' do
|
|
|
|
include_context 'disabled repository'
|
|
|
|
|
|
|
|
it_behaves_like '403 response' do
|
|
|
|
let(:request) { get api(route(file_path + '/blame'), current_user), params: params }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when unauthenticated', 'and project is public' do
|
|
|
|
it_behaves_like 'repository blame files' do
|
|
|
|
let(:project) { create(:project, :public, :repository) }
|
|
|
|
let(:current_user) { nil }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when unauthenticated', 'and project is private' do
|
|
|
|
it_behaves_like '404 response' do
|
|
|
|
let(:request) { get api(route(file_path)), params: params }
|
|
|
|
let(:message) { '404 Project Not Found' }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when authenticated', 'as a developer' do
|
|
|
|
it_behaves_like 'repository blame files' do
|
|
|
|
let(:current_user) { user }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when authenticated', 'as a guest' do
|
|
|
|
it_behaves_like '403 response' do
|
|
|
|
let(:request) { get api(route(file_path) + '/blame', guest), params: params }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when PATs are used' do
|
|
|
|
it 'returns blame file by commit sha' do
|
|
|
|
token = create(:personal_access_token, scopes: ['read_repository'], user: user)
|
|
|
|
|
|
|
|
# This file is deleted on HEAD
|
|
|
|
file_path = 'files%2Fjs%2Fcommit%2Ejs%2Ecoffee'
|
|
|
|
params[:ref] = '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9'
|
|
|
|
|
|
|
|
get api(route(file_path) + '/blame', personal_access_token: token), params: params
|
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2019-07-04 07:59:10 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-03-01 15:22:29 -05:00
|
|
|
describe "GET /projects/:id/repository/files/:file_path/raw" do
|
|
|
|
shared_examples_for 'repository raw files' do
|
2020-02-26 16:09:11 -05:00
|
|
|
it 'returns 400 when file path is invalid' do
|
|
|
|
get api(route(rouge_file_path) + "/raw", current_user), params: params
|
|
|
|
|
|
|
|
expect(response).to have_gitlab_http_status(:bad_request)
|
|
|
|
expect(json_response['error']).to eq(invalid_file_message)
|
|
|
|
end
|
|
|
|
|
2020-07-21 20:09:26 -04:00
|
|
|
it_behaves_like 'when path is absolute' do
|
|
|
|
subject { get api(route(absolute_path) + '/raw', current_user), params: params }
|
|
|
|
end
|
|
|
|
|
2017-03-01 15:22:29 -05:00
|
|
|
it 'returns raw file info' do
|
|
|
|
url = route(file_path) + "/raw"
|
|
|
|
expect(Gitlab::Workhorse).to receive(:send_git_blob)
|
|
|
|
|
2018-12-17 17:52:17 -05:00
|
|
|
get api(url, current_user), params: params
|
2017-03-01 15:22:29 -05:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2017-03-01 15:22:29 -05:00
|
|
|
end
|
|
|
|
|
2017-08-21 17:09:45 -04:00
|
|
|
it 'returns raw file info for files with dots' do
|
|
|
|
url = route('.gitignore') + "/raw"
|
|
|
|
expect(Gitlab::Workhorse).to receive(:send_git_blob)
|
|
|
|
|
2018-12-17 17:52:17 -05:00
|
|
|
get api(url, current_user), params: params
|
2017-08-21 17:09:45 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2017-08-21 17:09:45 -04:00
|
|
|
end
|
|
|
|
|
2017-03-07 19:14:33 -05:00
|
|
|
it 'returns file by commit sha' do
|
|
|
|
# This file is deleted on HEAD
|
|
|
|
file_path = "files%2Fjs%2Fcommit%2Ejs%2Ecoffee"
|
|
|
|
params[:ref] = "6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9"
|
|
|
|
expect(Gitlab::Workhorse).to receive(:send_git_blob)
|
|
|
|
|
2018-12-17 17:52:17 -05:00
|
|
|
get api(route(file_path) + "/raw", current_user), params: params
|
2017-03-07 19:14:33 -05:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2017-03-07 19:14:33 -05:00
|
|
|
end
|
|
|
|
|
2020-11-10 22:08:57 -05:00
|
|
|
it 'sets no-cache headers' do
|
|
|
|
url = route('.gitignore') + "/raw"
|
|
|
|
expect(Gitlab::Workhorse).to receive(:send_git_blob)
|
2020-01-30 16:08:47 -05:00
|
|
|
|
2020-11-10 22:08:57 -05:00
|
|
|
get api(url, current_user), params: params
|
|
|
|
|
|
|
|
expect(response.headers["Cache-Control"]).to include("no-store")
|
|
|
|
expect(response.headers["Cache-Control"]).to include("no-cache")
|
|
|
|
expect(response.headers["Pragma"]).to eq("no-cache")
|
|
|
|
expect(response.headers["Expires"]).to eq("Fri, 01 Jan 1990 00:00:00 GMT")
|
2020-01-30 16:08:47 -05:00
|
|
|
end
|
|
|
|
|
2017-03-01 15:22:29 -05:00
|
|
|
context 'when mandatory params are not given' do
|
|
|
|
it_behaves_like '400 response' do
|
|
|
|
let(:request) { get api(route("any%2Ffile"), current_user) }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when file_path does not exist' do
|
|
|
|
let(:params) { { ref: 'master' } }
|
|
|
|
|
|
|
|
it_behaves_like '404 response' do
|
2018-12-17 17:52:17 -05:00
|
|
|
let(:request) { get api(route('app%2Fmodels%2Fapplication%2Erb'), current_user), params: params }
|
2017-03-01 15:22:29 -05:00
|
|
|
let(:message) { '404 File Not Found' }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when repository is disabled' do
|
|
|
|
include_context 'disabled repository'
|
|
|
|
|
|
|
|
it_behaves_like '403 response' do
|
2018-12-17 17:52:17 -05:00
|
|
|
let(:request) { get api(route(file_path), current_user), params: params }
|
2017-03-01 15:22:29 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when unauthenticated', 'and project is public' do
|
|
|
|
it_behaves_like 'repository raw files' do
|
2017-08-01 14:51:52 -04:00
|
|
|
let(:project) { create(:project, :public, :repository) }
|
2017-03-01 15:22:29 -05:00
|
|
|
let(:current_user) { nil }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when unauthenticated', 'and project is private' do
|
|
|
|
it_behaves_like '404 response' do
|
2018-12-17 17:52:17 -05:00
|
|
|
let(:request) { get api(route(file_path)), params: params }
|
2017-03-01 15:22:29 -05:00
|
|
|
let(:message) { '404 Project Not Found' }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when authenticated', 'as a developer' do
|
|
|
|
it_behaves_like 'repository raw files' do
|
|
|
|
let(:current_user) { user }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when authenticated', 'as a guest' do
|
|
|
|
it_behaves_like '403 response' do
|
2018-12-17 17:52:17 -05:00
|
|
|
let(:request) { get api(route(file_path), guest), params: params }
|
2017-03-01 15:22:29 -05:00
|
|
|
end
|
|
|
|
end
|
2018-12-04 05:55:34 -05:00
|
|
|
|
|
|
|
context 'when PATs are used' do
|
|
|
|
it 'returns file by commit sha' do
|
|
|
|
token = create(:personal_access_token, scopes: ['read_repository'], user: user)
|
|
|
|
|
|
|
|
# This file is deleted on HEAD
|
|
|
|
file_path = "files%2Fjs%2Fcommit%2Ejs%2Ecoffee"
|
|
|
|
params[:ref] = "6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9"
|
|
|
|
expect(Gitlab::Workhorse).to receive(:send_git_blob)
|
|
|
|
|
2018-12-17 17:52:17 -05:00
|
|
|
get api(route(file_path) + "/raw", personal_access_token: token), params: params
|
2018-12-04 05:55:34 -05:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2018-12-04 05:55:34 -05:00
|
|
|
end
|
|
|
|
end
|
2017-03-01 15:22:29 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
describe "POST /projects/:id/repository/files/:file_path" do
|
|
|
|
let!(:file_path) { "new_subfolder%2Fnewfile%2Erb" }
|
2018-08-21 05:14:31 -04:00
|
|
|
let(:params) do
|
2013-11-11 07:58:06 -05:00
|
|
|
{
|
2017-03-01 15:22:29 -05:00
|
|
|
branch: "master",
|
|
|
|
content: "puts 8",
|
|
|
|
commit_message: "Added newfile"
|
2013-11-11 07:58:06 -05:00
|
|
|
}
|
2015-06-22 16:00:54 -04:00
|
|
|
end
|
2013-11-11 07:58:06 -05:00
|
|
|
|
2020-02-26 16:09:11 -05:00
|
|
|
it 'returns 400 when file path is invalid' do
|
|
|
|
post api(route(rouge_file_path), user), params: params
|
|
|
|
|
|
|
|
expect(response).to have_gitlab_http_status(:bad_request)
|
|
|
|
expect(json_response['error']).to eq(invalid_file_message)
|
|
|
|
end
|
|
|
|
|
2020-07-21 20:09:26 -04:00
|
|
|
it_behaves_like 'when path is absolute' do
|
|
|
|
subject { post api(route(absolute_path), user), params: params }
|
|
|
|
end
|
|
|
|
|
2016-08-01 11:00:44 -04:00
|
|
|
it "creates a new file in project repo" do
|
2018-12-17 17:52:17 -05:00
|
|
|
post api(route(file_path), user), params: params
|
2016-09-08 11:40:07 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:created)
|
2017-03-01 15:22:29 -05:00
|
|
|
expect(json_response["file_path"]).to eq(CGI.unescape(file_path))
|
2016-09-08 11:40:07 -04:00
|
|
|
last_commit = project.repository.commit.raw
|
|
|
|
expect(last_commit.author_email).to eq(user.email)
|
|
|
|
expect(last_commit.author_name).to eq(user.name)
|
2013-11-07 11:53:35 -05:00
|
|
|
end
|
|
|
|
|
2017-03-01 15:22:29 -05:00
|
|
|
it "returns a 400 bad request if no mandatory params given" do
|
|
|
|
post api(route("any%2Etxt"), user)
|
2016-09-08 11:40:07 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:bad_request)
|
2013-11-07 11:53:35 -05:00
|
|
|
end
|
|
|
|
|
2018-08-21 04:56:34 -04:00
|
|
|
it 'returns a 400 bad request if the commit message is empty' do
|
2018-08-21 05:14:31 -04:00
|
|
|
params[:commit_message] = ''
|
2018-08-21 04:56:34 -04:00
|
|
|
|
2018-12-17 17:52:17 -05:00
|
|
|
post api(route(file_path), user), params: params
|
2018-08-21 04:56:34 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:bad_request)
|
2018-08-21 04:56:34 -04:00
|
|
|
end
|
|
|
|
|
2016-08-01 11:00:44 -04:00
|
|
|
it "returns a 400 if editor fails to create file" do
|
2019-12-16 07:07:43 -05:00
|
|
|
allow_next_instance_of(Repository) do |instance|
|
|
|
|
allow(instance).to receive(:create_file).and_raise(Gitlab::Git::CommitError, 'Cannot create file')
|
|
|
|
end
|
2013-11-07 11:53:35 -05:00
|
|
|
|
2018-12-17 17:52:17 -05:00
|
|
|
post api(route("any%2Etxt"), user), params: params
|
2016-09-08 11:40:07 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:bad_request)
|
2013-11-07 11:53:35 -05:00
|
|
|
end
|
2016-09-08 11:40:07 -04:00
|
|
|
|
2018-12-04 09:32:06 -05:00
|
|
|
context 'with PATs' do
|
|
|
|
it 'returns 403 with `read_repository` scope' do
|
|
|
|
token = create(:personal_access_token, scopes: ['read_repository'], user: user)
|
|
|
|
|
2018-12-17 17:52:17 -05:00
|
|
|
post api(route(file_path), personal_access_token: token), params: params
|
2018-12-04 09:32:06 -05:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:forbidden)
|
2018-12-04 09:32:06 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns 201 with `api` scope' do
|
|
|
|
token = create(:personal_access_token, scopes: ['api'], user: user)
|
|
|
|
|
2018-12-17 17:52:17 -05:00
|
|
|
post api(route(file_path), personal_access_token: token), params: params
|
2018-12-04 09:32:06 -05:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:created)
|
2018-12-04 09:32:06 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-09-08 11:40:07 -04:00
|
|
|
context "when specifying an author" do
|
|
|
|
it "creates a new file with the specified author" do
|
2018-08-21 05:14:31 -04:00
|
|
|
params.merge!(author_email: author_email, author_name: author_name)
|
2016-09-08 11:40:07 -04:00
|
|
|
|
2018-12-17 17:52:17 -05:00
|
|
|
post api(route("new_file_with_author%2Etxt"), user), params: params
|
2016-09-08 11:40:07 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:created)
|
2020-11-03 13:09:22 -05:00
|
|
|
expect(response.media_type).to eq('application/json')
|
2016-09-08 11:40:07 -04:00
|
|
|
last_commit = project.repository.commit.raw
|
|
|
|
expect(last_commit.author_email).to eq(author_email)
|
|
|
|
expect(last_commit.author_name).to eq(author_name)
|
|
|
|
end
|
|
|
|
end
|
2017-03-01 13:08:51 -05:00
|
|
|
|
|
|
|
context 'when the repo is empty' do
|
|
|
|
let!(:project) { create(:project_empty_repo, namespace: user.namespace ) }
|
|
|
|
|
|
|
|
it "creates a new file in project repo" do
|
2018-12-17 17:52:17 -05:00
|
|
|
post api(route("newfile%2Erb"), user), params: params
|
2017-03-01 13:08:51 -05:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:created)
|
2017-03-01 13:08:51 -05:00
|
|
|
expect(json_response['file_path']).to eq('newfile.rb')
|
|
|
|
last_commit = project.repository.commit.raw
|
|
|
|
expect(last_commit.author_email).to eq(user.email)
|
|
|
|
expect(last_commit.author_name).to eq(user.name)
|
|
|
|
end
|
|
|
|
end
|
2013-11-07 11:53:35 -05:00
|
|
|
end
|
|
|
|
|
2013-11-11 07:58:06 -05:00
|
|
|
describe "PUT /projects/:id/repository/files" do
|
2018-08-21 05:14:31 -04:00
|
|
|
let(:params) do
|
2013-11-11 07:58:06 -05:00
|
|
|
{
|
2017-02-02 09:24:30 -05:00
|
|
|
branch: 'master',
|
2013-11-11 07:58:06 -05:00
|
|
|
content: 'puts 8',
|
|
|
|
commit_message: 'Changed file'
|
|
|
|
}
|
2015-06-22 16:00:54 -04:00
|
|
|
end
|
2013-11-11 07:58:06 -05:00
|
|
|
|
2016-08-01 11:00:44 -04:00
|
|
|
it "updates existing file in project repo" do
|
2018-12-17 17:52:17 -05:00
|
|
|
put api(route(file_path), user), params: params
|
2016-09-08 11:40:07 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2017-03-01 15:22:29 -05:00
|
|
|
expect(json_response['file_path']).to eq(CGI.unescape(file_path))
|
2016-09-08 11:40:07 -04:00
|
|
|
last_commit = project.repository.commit.raw
|
|
|
|
expect(last_commit.author_email).to eq(user.email)
|
|
|
|
expect(last_commit.author_name).to eq(user.name)
|
2013-11-11 07:58:06 -05:00
|
|
|
end
|
|
|
|
|
2018-08-21 05:14:31 -04:00
|
|
|
it 'returns a 400 bad request if the commit message is empty' do
|
|
|
|
params[:commit_message] = ''
|
|
|
|
|
2018-12-17 17:52:17 -05:00
|
|
|
put api(route(file_path), user), params: params
|
2018-08-21 05:14:31 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:bad_request)
|
2018-08-21 05:14:31 -04:00
|
|
|
end
|
|
|
|
|
2017-06-06 09:55:29 -04:00
|
|
|
it "returns a 400 bad request if update existing file with stale last commit id" do
|
2018-08-21 05:14:31 -04:00
|
|
|
params_with_stale_id = params.merge(last_commit_id: 'stale')
|
2017-06-06 09:55:29 -04:00
|
|
|
|
2018-12-17 17:52:17 -05:00
|
|
|
put api(route(file_path), user), params: params_with_stale_id
|
2017-06-06 09:55:29 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:bad_request)
|
2019-12-12 07:07:33 -05:00
|
|
|
expect(json_response['message']).to eq(_('You are attempting to update a file that has changed since you started editing it.'))
|
2017-06-06 09:55:29 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it "updates existing file in project repo with accepts correct last commit id" do
|
|
|
|
last_commit = Gitlab::Git::Commit
|
2020-09-22 14:09:54 -04:00
|
|
|
.last_for_path(project.repository, 'master', Addressable::URI.unencode_component(file_path))
|
2018-08-21 05:14:31 -04:00
|
|
|
params_with_correct_id = params.merge(last_commit_id: last_commit.id)
|
2017-06-06 09:55:29 -04:00
|
|
|
|
2018-12-17 17:52:17 -05:00
|
|
|
put api(route(file_path), user), params: params_with_correct_id
|
2017-06-06 09:55:29 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2017-06-06 09:55:29 -04:00
|
|
|
end
|
|
|
|
|
2020-02-26 16:09:11 -05:00
|
|
|
it "returns 400 when file path is invalid" do
|
|
|
|
last_commit = Gitlab::Git::Commit
|
2020-09-22 14:09:54 -04:00
|
|
|
.last_for_path(project.repository, 'master', Addressable::URI.unencode_component(file_path))
|
2020-02-26 16:09:11 -05:00
|
|
|
params_with_correct_id = params.merge(last_commit_id: last_commit.id)
|
|
|
|
|
|
|
|
put api(route(rouge_file_path), user), params: params_with_correct_id
|
|
|
|
|
|
|
|
expect(response).to have_gitlab_http_status(:bad_request)
|
|
|
|
expect(json_response['error']).to eq(invalid_file_message)
|
|
|
|
end
|
|
|
|
|
2020-07-21 20:09:26 -04:00
|
|
|
it_behaves_like 'when path is absolute' do
|
|
|
|
let(:last_commit) do
|
|
|
|
Gitlab::Git::Commit
|
2020-09-22 14:09:54 -04:00
|
|
|
.last_for_path(project.repository, 'master', Addressable::URI.unencode_component(file_path))
|
2020-07-21 20:09:26 -04:00
|
|
|
end
|
2020-08-10 23:11:00 -04:00
|
|
|
|
2020-07-21 20:09:26 -04:00
|
|
|
let(:params_with_correct_id) { params.merge(last_commit_id: last_commit.id) }
|
|
|
|
|
|
|
|
subject { put api(route(absolute_path), user), params: params_with_correct_id }
|
|
|
|
end
|
|
|
|
|
2016-08-01 11:00:44 -04:00
|
|
|
it "returns a 400 bad request if no params given" do
|
2017-03-01 15:22:29 -05:00
|
|
|
put api(route(file_path), user)
|
2016-09-08 11:40:07 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:bad_request)
|
2013-11-11 07:58:06 -05:00
|
|
|
end
|
2016-09-08 11:40:07 -04:00
|
|
|
|
|
|
|
context "when specifying an author" do
|
|
|
|
it "updates a file with the specified author" do
|
2018-08-21 05:14:31 -04:00
|
|
|
params.merge!(author_email: author_email, author_name: author_name, content: "New content")
|
2016-09-08 11:40:07 -04:00
|
|
|
|
2018-12-17 17:52:17 -05:00
|
|
|
put api(route(file_path), user), params: params
|
2016-09-08 11:40:07 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2016-09-08 11:40:07 -04:00
|
|
|
last_commit = project.repository.commit.raw
|
|
|
|
expect(last_commit.author_email).to eq(author_email)
|
|
|
|
expect(last_commit.author_name).to eq(author_name)
|
|
|
|
end
|
|
|
|
end
|
2013-11-07 11:53:35 -05:00
|
|
|
end
|
2013-11-19 09:36:11 -05:00
|
|
|
|
|
|
|
describe "DELETE /projects/:id/repository/files" do
|
2018-08-21 05:42:33 -04:00
|
|
|
let(:params) do
|
2013-11-19 09:36:11 -05:00
|
|
|
{
|
2017-02-02 09:24:30 -05:00
|
|
|
branch: 'master',
|
2013-11-19 09:36:11 -05:00
|
|
|
commit_message: 'Changed file'
|
|
|
|
}
|
2015-06-22 16:00:54 -04:00
|
|
|
end
|
2013-11-19 09:36:11 -05:00
|
|
|
|
2020-02-26 16:09:11 -05:00
|
|
|
it 'returns 400 when file path is invalid' do
|
|
|
|
delete api(route(rouge_file_path), user), params: params
|
|
|
|
|
|
|
|
expect(response).to have_gitlab_http_status(:bad_request)
|
|
|
|
expect(json_response['error']).to eq(invalid_file_message)
|
|
|
|
end
|
|
|
|
|
2020-07-21 20:09:26 -04:00
|
|
|
it_behaves_like 'when path is absolute' do
|
|
|
|
subject { delete api(route(absolute_path), user), params: params }
|
|
|
|
end
|
|
|
|
|
2016-08-01 11:00:44 -04:00
|
|
|
it "deletes existing file in project repo" do
|
2018-12-17 17:52:17 -05:00
|
|
|
delete api(route(file_path), user), params: params
|
2016-09-08 11:40:07 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:no_content)
|
2013-11-19 09:36:11 -05:00
|
|
|
end
|
|
|
|
|
2016-08-01 11:00:44 -04:00
|
|
|
it "returns a 400 bad request if no params given" do
|
2017-03-01 15:22:29 -05:00
|
|
|
delete api(route(file_path), user)
|
2016-09-08 11:40:07 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:bad_request)
|
2013-11-19 09:36:11 -05:00
|
|
|
end
|
|
|
|
|
2018-08-21 05:42:33 -04:00
|
|
|
it 'returns a 400 bad request if the commit message is empty' do
|
|
|
|
params[:commit_message] = ''
|
|
|
|
|
2018-12-17 17:52:17 -05:00
|
|
|
delete api(route(file_path), user), params: params
|
2018-08-21 05:42:33 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:bad_request)
|
2018-08-21 05:42:33 -04:00
|
|
|
end
|
|
|
|
|
2017-04-19 20:37:44 -04:00
|
|
|
it "returns a 400 if fails to delete file" do
|
2019-12-16 07:07:43 -05:00
|
|
|
allow_next_instance_of(Repository) do |instance|
|
|
|
|
allow(instance).to receive(:delete_file).and_raise(Gitlab::Git::CommitError, 'Cannot delete file')
|
|
|
|
end
|
2013-11-19 09:36:11 -05:00
|
|
|
|
2018-12-17 17:52:17 -05:00
|
|
|
delete api(route(file_path), user), params: params
|
2016-09-08 11:40:07 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:bad_request)
|
2013-11-19 09:36:11 -05:00
|
|
|
end
|
2016-09-08 11:40:07 -04:00
|
|
|
|
|
|
|
context "when specifying an author" do
|
|
|
|
it "removes a file with the specified author" do
|
2018-08-21 05:42:33 -04:00
|
|
|
params.merge!(author_email: author_email, author_name: author_name)
|
2016-09-08 11:40:07 -04:00
|
|
|
|
2018-12-17 17:52:17 -05:00
|
|
|
delete api(route(file_path), user), params: params
|
2016-09-08 11:40:07 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:no_content)
|
2016-09-08 11:40:07 -04:00
|
|
|
end
|
|
|
|
end
|
2013-11-19 09:36:11 -05:00
|
|
|
end
|
2015-08-09 01:35:40 -04:00
|
|
|
|
|
|
|
describe "POST /projects/:id/repository/files with binary file" do
|
2017-03-01 15:22:29 -05:00
|
|
|
let(:file_path) { 'test%2Ebin' }
|
2015-08-09 01:35:40 -04:00
|
|
|
let(:put_params) do
|
|
|
|
{
|
2017-02-02 09:24:30 -05:00
|
|
|
branch: 'master',
|
2015-08-09 01:35:40 -04:00
|
|
|
content: 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEUAAACnej3aAAAAAXRSTlMAQObYZgAAAApJREFUCNdjYAAAAAIAAeIhvDMAAAAASUVORK5CYII=',
|
|
|
|
commit_message: 'Binary file with a \n should not be touched',
|
|
|
|
encoding: 'base64'
|
|
|
|
}
|
|
|
|
end
|
2020-08-10 23:11:00 -04:00
|
|
|
|
2015-08-09 01:35:40 -04:00
|
|
|
let(:get_params) do
|
|
|
|
{
|
2017-05-03 07:22:03 -04:00
|
|
|
ref: 'master'
|
2015-08-09 01:35:40 -04:00
|
|
|
}
|
|
|
|
end
|
|
|
|
|
|
|
|
before do
|
2018-12-17 17:52:17 -05:00
|
|
|
post api(route(file_path), user), params: put_params
|
2015-08-09 01:35:40 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it "remains unchanged" do
|
2018-12-17 17:52:17 -05:00
|
|
|
get api(route(file_path), user), params: get_params
|
2016-09-08 11:40:07 -04:00
|
|
|
|
2020-02-21 07:09:07 -05:00
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
2017-03-01 15:22:29 -05:00
|
|
|
expect(json_response['file_path']).to eq(CGI.unescape(file_path))
|
|
|
|
expect(json_response['file_name']).to eq(CGI.unescape(file_path))
|
2015-08-09 01:35:40 -04:00
|
|
|
expect(json_response['content']).to eq(put_params[:content])
|
|
|
|
end
|
|
|
|
end
|
2013-11-07 11:53:35 -05:00
|
|
|
end
|