1016 lines
32 KiB
Ruby
1016 lines
32 KiB
Ruby
require 'spec_helper'
|
|
require 'mime/types'
|
|
|
|
describe API::Commits do
|
|
let(:user) { create(:user) }
|
|
let(:guest) { create(:user).tap { |u| project.add_guest(u) } }
|
|
let(:project) { create(:project, :repository, creator: user, path: 'my.project') }
|
|
let(:branch_with_dot) { project.repository.find_branch('ends-with.json') }
|
|
let(:branch_with_slash) { project.repository.find_branch('improve/awesome') }
|
|
|
|
let(:project_id) { project.id }
|
|
let(:current_user) { nil }
|
|
|
|
before do
|
|
project.add_master(user)
|
|
end
|
|
|
|
describe 'GET /projects/:id/repository/commits' do
|
|
context 'authorized user' do
|
|
it "returns project commits" do
|
|
commit = project.repository.commit
|
|
|
|
get api("/projects/#{project_id}/repository/commits", user)
|
|
|
|
expect(response).to have_http_status(200)
|
|
expect(response).to match_response_schema('public_api/v4/commits')
|
|
expect(json_response.first['id']).to eq(commit.id)
|
|
expect(json_response.first['committer_name']).to eq(commit.committer_name)
|
|
expect(json_response.first['committer_email']).to eq(commit.committer_email)
|
|
end
|
|
|
|
it 'include correct pagination headers' do
|
|
commit_count = project.repository.count_commits(ref: 'master').to_s
|
|
|
|
get api("/projects/#{project_id}/repository/commits", user)
|
|
|
|
expect(response).to include_pagination_headers
|
|
expect(response.headers['X-Total']).to eq(commit_count)
|
|
expect(response.headers['X-Page']).to eql('1')
|
|
end
|
|
end
|
|
|
|
context "unauthorized user" do
|
|
it "does not return project commits" do
|
|
get api("/projects/#{project_id}/repository/commits")
|
|
|
|
expect(response).to have_http_status(404)
|
|
end
|
|
end
|
|
|
|
context "since optional parameter" do
|
|
it "returns project commits since provided parameter" do
|
|
commits = project.repository.commits("master")
|
|
after = commits.second.created_at
|
|
|
|
get api("/projects/#{project_id}/repository/commits?since=#{after.utc.iso8601}", user)
|
|
|
|
expect(json_response.size).to eq 2
|
|
expect(json_response.first["id"]).to eq(commits.first.id)
|
|
expect(json_response.second["id"]).to eq(commits.second.id)
|
|
end
|
|
|
|
it 'include correct pagination headers' do
|
|
commits = project.repository.commits("master")
|
|
after = commits.second.created_at
|
|
commit_count = project.repository.count_commits(ref: 'master', after: after).to_s
|
|
|
|
get api("/projects/#{project_id}/repository/commits?since=#{after.utc.iso8601}", user)
|
|
|
|
expect(response).to include_pagination_headers
|
|
expect(response.headers['X-Total']).to eq(commit_count)
|
|
expect(response.headers['X-Page']).to eql('1')
|
|
end
|
|
end
|
|
|
|
context "until optional parameter" do
|
|
it "returns project commits until provided parameter" do
|
|
commits = project.repository.commits("master")
|
|
before = commits.second.created_at
|
|
|
|
get api("/projects/#{project_id}/repository/commits?until=#{before.utc.iso8601}", user)
|
|
|
|
if commits.size >= 20
|
|
expect(json_response.size).to eq(20)
|
|
else
|
|
expect(json_response.size).to eq(commits.size - 1)
|
|
end
|
|
|
|
expect(json_response.first["id"]).to eq(commits.second.id)
|
|
expect(json_response.second["id"]).to eq(commits.third.id)
|
|
end
|
|
|
|
it 'include correct pagination headers' do
|
|
commits = project.repository.commits("master")
|
|
before = commits.second.created_at
|
|
commit_count = project.repository.count_commits(ref: 'master', before: before).to_s
|
|
|
|
get api("/projects/#{project_id}/repository/commits?until=#{before.utc.iso8601}", user)
|
|
|
|
expect(response).to include_pagination_headers
|
|
expect(response.headers['X-Total']).to eq(commit_count)
|
|
expect(response.headers['X-Page']).to eql('1')
|
|
end
|
|
end
|
|
|
|
context "invalid xmlschema date parameters" do
|
|
it "returns an invalid parameter error message" do
|
|
get api("/projects/#{project_id}/repository/commits?since=invalid-date", user)
|
|
|
|
expect(response).to have_http_status(400)
|
|
expect(json_response['error']).to eq('since is invalid')
|
|
end
|
|
end
|
|
|
|
context "path optional parameter" do
|
|
it "returns project commits matching provided path parameter" do
|
|
path = 'files/ruby/popen.rb'
|
|
commit_count = project.repository.count_commits(ref: 'master', path: path).to_s
|
|
|
|
get api("/projects/#{project_id}/repository/commits?path=#{path}", user)
|
|
|
|
expect(json_response.size).to eq(3)
|
|
expect(json_response.first["id"]).to eq("570e7b2abdd848b95f2f578043fc23bd6f6fd24d")
|
|
expect(response).to include_pagination_headers
|
|
expect(response.headers['X-Total']).to eq(commit_count)
|
|
end
|
|
|
|
it 'include correct pagination headers' do
|
|
path = 'files/ruby/popen.rb'
|
|
commit_count = project.repository.count_commits(ref: 'master', path: path).to_s
|
|
|
|
get api("/projects/#{project_id}/repository/commits?path=#{path}", user)
|
|
|
|
expect(response).to include_pagination_headers
|
|
expect(response.headers['X-Total']).to eq(commit_count)
|
|
expect(response.headers['X-Page']).to eql('1')
|
|
end
|
|
end
|
|
|
|
context 'with pagination params' do
|
|
let(:page) { 1 }
|
|
let(:per_page) { 5 }
|
|
let(:ref_name) { 'master' }
|
|
let!(:request) do
|
|
get api("/projects/#{project_id}/repository/commits?page=#{page}&per_page=#{per_page}&ref_name=#{ref_name}", user)
|
|
end
|
|
|
|
it 'returns correct headers' do
|
|
commit_count = project.repository.count_commits(ref: ref_name).to_s
|
|
|
|
expect(response).to include_pagination_headers
|
|
expect(response.headers['X-Total']).to eq(commit_count)
|
|
expect(response.headers['X-Page']).to eq('1')
|
|
expect(response.headers['Link']).to match(/page=1&per_page=5/)
|
|
expect(response.headers['Link']).to match(/page=2&per_page=5/)
|
|
end
|
|
|
|
context 'viewing the first page' do
|
|
it 'returns the first 5 commits' do
|
|
commit = project.repository.commit
|
|
|
|
expect(json_response.size).to eq(per_page)
|
|
expect(json_response.first['id']).to eq(commit.id)
|
|
expect(response.headers['X-Page']).to eq('1')
|
|
end
|
|
end
|
|
|
|
context 'viewing the third page' do
|
|
let(:page) { 3 }
|
|
|
|
it 'returns the third 5 commits' do
|
|
commit = project.repository.commits('HEAD', offset: (page - 1) * per_page).first
|
|
|
|
expect(json_response.size).to eq(per_page)
|
|
expect(json_response.first['id']).to eq(commit.id)
|
|
expect(response.headers['X-Page']).to eq('3')
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
describe "POST /projects/:id/repository/commits" do
|
|
let!(:url) { "/projects/#{project_id}/repository/commits" }
|
|
|
|
it 'returns a 403 unauthorized for user without permissions' do
|
|
post api(url, guest)
|
|
|
|
expect(response).to have_http_status(403)
|
|
end
|
|
|
|
it 'returns a 400 bad request if no params are given' do
|
|
post api(url, user)
|
|
|
|
expect(response).to have_http_status(400)
|
|
end
|
|
|
|
describe 'create' do
|
|
let(:message) { 'Created file' }
|
|
let!(:invalid_c_params) do
|
|
{
|
|
branch: 'master',
|
|
commit_message: message,
|
|
actions: [
|
|
{
|
|
action: 'create',
|
|
file_path: 'files/ruby/popen.rb',
|
|
content: 'puts 8'
|
|
}
|
|
]
|
|
}
|
|
end
|
|
let!(:valid_c_params) do
|
|
{
|
|
branch: 'master',
|
|
commit_message: message,
|
|
actions: [
|
|
{
|
|
action: 'create',
|
|
file_path: 'foo/bar/baz.txt',
|
|
content: 'puts 8'
|
|
}
|
|
]
|
|
}
|
|
end
|
|
|
|
it 'a new file in project repo' do
|
|
post api(url, user), valid_c_params
|
|
|
|
expect(response).to have_gitlab_http_status(201)
|
|
expect(json_response['title']).to eq(message)
|
|
expect(json_response['committer_name']).to eq(user.name)
|
|
expect(json_response['committer_email']).to eq(user.email)
|
|
end
|
|
|
|
it 'returns a 400 bad request if file exists' do
|
|
post api(url, user), invalid_c_params
|
|
|
|
expect(response).to have_http_status(400)
|
|
end
|
|
|
|
context 'with project path containing a dot in URL' do
|
|
let(:url) { "/projects/#{CGI.escape(project.full_path)}/repository/commits" }
|
|
|
|
it 'a new file in project repo' do
|
|
post api(url, user), valid_c_params
|
|
|
|
expect(response).to have_http_status(201)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'delete' do
|
|
let(:message) { 'Deleted file' }
|
|
let!(:invalid_d_params) do
|
|
{
|
|
branch: 'markdown',
|
|
commit_message: message,
|
|
actions: [
|
|
{
|
|
action: 'delete',
|
|
file_path: 'doc/api/projects.md'
|
|
}
|
|
]
|
|
}
|
|
end
|
|
let!(:valid_d_params) do
|
|
{
|
|
branch: 'markdown',
|
|
commit_message: message,
|
|
actions: [
|
|
{
|
|
action: 'delete',
|
|
file_path: 'doc/api/users.md'
|
|
}
|
|
]
|
|
}
|
|
end
|
|
|
|
it 'an existing file in project repo' do
|
|
post api(url, user), valid_d_params
|
|
|
|
expect(response).to have_http_status(201)
|
|
expect(json_response['title']).to eq(message)
|
|
end
|
|
|
|
it 'returns a 400 bad request if file does not exist' do
|
|
post api(url, user), invalid_d_params
|
|
|
|
expect(response).to have_http_status(400)
|
|
end
|
|
end
|
|
|
|
describe 'move' do
|
|
let(:message) { 'Moved file' }
|
|
let!(:invalid_m_params) do
|
|
{
|
|
branch: 'feature',
|
|
commit_message: message,
|
|
actions: [
|
|
{
|
|
action: 'move',
|
|
file_path: 'CHANGELOG',
|
|
previous_path: 'VERSION',
|
|
content: '6.7.0.pre'
|
|
}
|
|
]
|
|
}
|
|
end
|
|
let!(:valid_m_params) do
|
|
{
|
|
branch: 'feature',
|
|
commit_message: message,
|
|
actions: [
|
|
{
|
|
action: 'move',
|
|
file_path: 'VERSION.txt',
|
|
previous_path: 'VERSION',
|
|
content: '6.7.0.pre'
|
|
}
|
|
]
|
|
}
|
|
end
|
|
|
|
it 'an existing file in project repo' do
|
|
post api(url, user), valid_m_params
|
|
|
|
expect(response).to have_http_status(201)
|
|
expect(json_response['title']).to eq(message)
|
|
end
|
|
|
|
it 'returns a 400 bad request if file does not exist' do
|
|
post api(url, user), invalid_m_params
|
|
|
|
expect(response).to have_http_status(400)
|
|
end
|
|
end
|
|
|
|
describe 'update' do
|
|
let(:message) { 'Updated file' }
|
|
let!(:invalid_u_params) do
|
|
{
|
|
branch: 'master',
|
|
commit_message: message,
|
|
actions: [
|
|
{
|
|
action: 'update',
|
|
file_path: 'foo/bar.baz',
|
|
content: 'puts 8'
|
|
}
|
|
]
|
|
}
|
|
end
|
|
let!(:valid_u_params) do
|
|
{
|
|
branch: 'master',
|
|
commit_message: message,
|
|
actions: [
|
|
{
|
|
action: 'update',
|
|
file_path: 'files/ruby/popen.rb',
|
|
content: 'puts 8'
|
|
}
|
|
]
|
|
}
|
|
end
|
|
|
|
it 'an existing file in project repo' do
|
|
post api(url, user), valid_u_params
|
|
|
|
expect(response).to have_http_status(201)
|
|
expect(json_response['title']).to eq(message)
|
|
end
|
|
|
|
it 'returns a 400 bad request if file does not exist' do
|
|
post api(url, user), invalid_u_params
|
|
|
|
expect(response).to have_http_status(400)
|
|
end
|
|
end
|
|
|
|
describe 'multiple operations' do
|
|
let(:message) { 'Multiple actions' }
|
|
let!(:invalid_mo_params) do
|
|
{
|
|
branch: 'master',
|
|
commit_message: message,
|
|
actions: [
|
|
{
|
|
action: 'create',
|
|
file_path: 'files/ruby/popen.rb',
|
|
content: 'puts 8'
|
|
},
|
|
{
|
|
action: 'delete',
|
|
file_path: 'doc/api/projects.md'
|
|
},
|
|
{
|
|
action: 'move',
|
|
file_path: 'CHANGELOG',
|
|
previous_path: 'VERSION',
|
|
content: '6.7.0.pre'
|
|
},
|
|
{
|
|
action: 'update',
|
|
file_path: 'foo/bar.baz',
|
|
content: 'puts 8'
|
|
}
|
|
]
|
|
}
|
|
end
|
|
let!(:valid_mo_params) do
|
|
{
|
|
branch: 'master',
|
|
commit_message: message,
|
|
actions: [
|
|
{
|
|
action: 'create',
|
|
file_path: 'foo/bar/baz.txt',
|
|
content: 'puts 8'
|
|
},
|
|
{
|
|
action: 'delete',
|
|
file_path: 'Gemfile.zip'
|
|
},
|
|
{
|
|
action: 'move',
|
|
file_path: 'VERSION.txt',
|
|
previous_path: 'VERSION',
|
|
content: '6.7.0.pre'
|
|
},
|
|
{
|
|
action: 'update',
|
|
file_path: 'files/ruby/popen.rb',
|
|
content: 'puts 8'
|
|
}
|
|
]
|
|
}
|
|
end
|
|
|
|
it 'are commited as one in project repo' do
|
|
post api(url, user), valid_mo_params
|
|
|
|
expect(response).to have_http_status(201)
|
|
expect(json_response['title']).to eq(message)
|
|
end
|
|
|
|
it 'return a 400 bad request if there are any issues' do
|
|
post api(url, user), invalid_mo_params
|
|
|
|
expect(response).to have_http_status(400)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'GET /projects/:id/repository/commits/:sha' do
|
|
let(:commit) { project.repository.commit }
|
|
let(:commit_id) { commit.id }
|
|
let(:route) { "/projects/#{project_id}/repository/commits/#{commit_id}" }
|
|
|
|
shared_examples_for 'ref commit' do
|
|
it 'returns the ref last commit' do
|
|
get api(route, current_user)
|
|
|
|
expect(response).to have_gitlab_http_status(200)
|
|
expect(response).to match_response_schema('public_api/v4/commit/detail')
|
|
expect(json_response['id']).to eq(commit.id)
|
|
expect(json_response['short_id']).to eq(commit.short_id)
|
|
expect(json_response['title']).to eq(commit.title)
|
|
expect(json_response['message']).to eq(commit.safe_message)
|
|
expect(json_response['author_name']).to eq(commit.author_name)
|
|
expect(json_response['author_email']).to eq(commit.author_email)
|
|
expect(json_response['authored_date']).to eq(commit.authored_date.iso8601(3))
|
|
expect(json_response['committer_name']).to eq(commit.committer_name)
|
|
expect(json_response['committer_email']).to eq(commit.committer_email)
|
|
expect(json_response['committed_date']).to eq(commit.committed_date.iso8601(3))
|
|
expect(json_response['parent_ids']).to eq(commit.parent_ids)
|
|
expect(json_response['stats']['additions']).to eq(commit.stats.additions)
|
|
expect(json_response['stats']['deletions']).to eq(commit.stats.deletions)
|
|
expect(json_response['stats']['total']).to eq(commit.stats.total)
|
|
expect(json_response['status']).to be_nil
|
|
end
|
|
|
|
context 'when ref does not exist' do
|
|
let(:commit_id) { 'unknown' }
|
|
|
|
it_behaves_like '404 response' do
|
|
let(:request) { get api(route, current_user) }
|
|
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, current_user) }
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when unauthenticated', 'and project is public' do
|
|
let(:project) { create(:project, :public, :repository) }
|
|
|
|
it_behaves_like 'ref commit'
|
|
end
|
|
|
|
context 'when unauthenticated', 'and project is private' do
|
|
it_behaves_like '404 response' do
|
|
let(:request) { get api(route) }
|
|
let(:message) { '404 Project Not Found' }
|
|
end
|
|
end
|
|
|
|
context 'when authenticated', 'as a master' do
|
|
let(:current_user) { user }
|
|
|
|
it_behaves_like 'ref commit'
|
|
|
|
context 'when branch contains a dot' do
|
|
let(:commit) { project.repository.commit(branch_with_dot.name) }
|
|
let(:commit_id) { branch_with_dot.name }
|
|
|
|
it_behaves_like 'ref commit'
|
|
end
|
|
|
|
context 'when branch contains a slash' do
|
|
let(:commit_id) { branch_with_slash.name }
|
|
|
|
it_behaves_like '404 response' do
|
|
let(:request) { get api(route, current_user) }
|
|
end
|
|
end
|
|
|
|
context 'when branch contains an escaped slash' do
|
|
let(:commit) { project.repository.commit(branch_with_slash.name) }
|
|
let(:commit_id) { CGI.escape(branch_with_slash.name) }
|
|
|
|
it_behaves_like 'ref commit'
|
|
end
|
|
|
|
context 'requesting with the escaped project full path' do
|
|
let(:project_id) { CGI.escape(project.full_path) }
|
|
|
|
it_behaves_like 'ref commit'
|
|
|
|
context 'when branch contains a dot' do
|
|
let(:commit) { project.repository.commit(branch_with_dot.name) }
|
|
let(:commit_id) { branch_with_dot.name }
|
|
|
|
it_behaves_like 'ref commit'
|
|
end
|
|
end
|
|
|
|
context 'when the ref has a pipeline' do
|
|
let!(:pipeline) { project.pipelines.create(source: :push, ref: 'master', sha: commit.sha) }
|
|
|
|
it 'includes a "created" status' do
|
|
get api(route, current_user)
|
|
|
|
expect(response).to have_http_status(200)
|
|
expect(response).to match_response_schema('public_api/v4/commit/detail')
|
|
expect(json_response['status']).to eq('created')
|
|
end
|
|
|
|
context 'when pipeline succeeds' do
|
|
before do
|
|
pipeline.update(status: 'success')
|
|
end
|
|
|
|
it 'includes a "success" status' do
|
|
get api(route, current_user)
|
|
|
|
expect(response).to have_http_status(200)
|
|
expect(response).to match_response_schema('public_api/v4/commit/detail')
|
|
expect(json_response['status']).to eq('success')
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'GET /projects/:id/repository/commits/:sha/diff' do
|
|
let(:commit) { project.repository.commit }
|
|
let(:commit_id) { commit.id }
|
|
let(:route) { "/projects/#{project_id}/repository/commits/#{commit_id}/diff" }
|
|
|
|
shared_examples_for 'ref diff' do
|
|
it 'returns the diff of the selected commit' do
|
|
get api(route, current_user)
|
|
|
|
expect(response).to have_gitlab_http_status(200)
|
|
expect(json_response.size).to be >= 1
|
|
expect(json_response.first.keys).to include 'diff'
|
|
end
|
|
|
|
context 'when ref does not exist' do
|
|
let(:commit_id) { 'unknown' }
|
|
|
|
it_behaves_like '404 response' do
|
|
let(:request) { get api(route, current_user) }
|
|
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, current_user) }
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when unauthenticated', 'and project is public' do
|
|
let(:project) { create(:project, :public, :repository) }
|
|
|
|
it_behaves_like 'ref diff'
|
|
end
|
|
|
|
context 'when unauthenticated', 'and project is private' do
|
|
it_behaves_like '404 response' do
|
|
let(:request) { get api(route) }
|
|
let(:message) { '404 Project Not Found' }
|
|
end
|
|
end
|
|
|
|
context 'when authenticated', 'as a master' do
|
|
let(:current_user) { user }
|
|
|
|
it_behaves_like 'ref diff'
|
|
|
|
context 'when branch contains a dot' do
|
|
let(:commit_id) { branch_with_dot.name }
|
|
|
|
it_behaves_like 'ref diff'
|
|
end
|
|
|
|
context 'when branch contains a slash' do
|
|
let(:commit_id) { branch_with_slash.name }
|
|
|
|
it_behaves_like '404 response' do
|
|
let(:request) { get api(route, current_user) }
|
|
end
|
|
end
|
|
|
|
context 'when branch contains an escaped slash' do
|
|
let(:commit_id) { CGI.escape(branch_with_slash.name) }
|
|
|
|
it_behaves_like 'ref diff'
|
|
end
|
|
|
|
context 'requesting with the escaped project full path' do
|
|
let(:project_id) { CGI.escape(project.full_path) }
|
|
|
|
it_behaves_like 'ref diff'
|
|
|
|
context 'when branch contains a dot' do
|
|
let(:commit_id) { branch_with_dot.name }
|
|
|
|
it_behaves_like 'ref diff'
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'GET /projects/:id/repository/commits/:sha/comments' do
|
|
let(:commit) { project.repository.commit }
|
|
let(:commit_id) { commit.id }
|
|
let(:route) { "/projects/#{project_id}/repository/commits/#{commit_id}/comments" }
|
|
|
|
shared_examples_for 'ref comments' do
|
|
context 'when ref exists' do
|
|
before do
|
|
create(:note_on_commit, author: user, project: project, commit_id: commit.id, note: 'a comment on a commit')
|
|
create(:note_on_commit, author: user, project: project, commit_id: commit.id, note: 'another comment on a commit')
|
|
end
|
|
|
|
it 'returns the diff of the selected commit' do
|
|
get api(route, current_user)
|
|
|
|
expect(response).to have_gitlab_http_status(200)
|
|
expect(response).to match_response_schema('public_api/v4/commit_notes')
|
|
expect(json_response.size).to eq(2)
|
|
expect(json_response.first['note']).to eq('a comment on a commit')
|
|
expect(json_response.first['author']['id']).to eq(user.id)
|
|
end
|
|
end
|
|
|
|
context 'when ref does not exist' do
|
|
let(:commit_id) { 'unknown' }
|
|
|
|
it_behaves_like '404 response' do
|
|
let(:request) { get api(route, current_user) }
|
|
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, current_user) }
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when unauthenticated', 'and project is public' do
|
|
let(:project) { create(:project, :public, :repository) }
|
|
|
|
it_behaves_like 'ref comments'
|
|
end
|
|
|
|
context 'when unauthenticated', 'and project is private' do
|
|
it_behaves_like '404 response' do
|
|
let(:request) { get api(route) }
|
|
let(:message) { '404 Project Not Found' }
|
|
end
|
|
end
|
|
|
|
context 'when authenticated', 'as a master' do
|
|
let(:current_user) { user }
|
|
|
|
it_behaves_like 'ref comments'
|
|
|
|
context 'when branch contains a dot' do
|
|
let(:commit) { project.repository.commit(branch_with_dot.name) }
|
|
let(:commit_id) { branch_with_dot.name }
|
|
|
|
it_behaves_like 'ref comments'
|
|
end
|
|
|
|
context 'when branch contains a slash' do
|
|
let(:commit) { project.repository.commit(branch_with_slash.name) }
|
|
let(:commit_id) { branch_with_slash.name }
|
|
|
|
it_behaves_like '404 response' do
|
|
let(:request) { get api(route, current_user) }
|
|
end
|
|
end
|
|
|
|
context 'when branch contains an escaped slash' do
|
|
let(:commit) { project.repository.commit(branch_with_slash.name) }
|
|
let(:commit_id) { CGI.escape(branch_with_slash.name) }
|
|
|
|
it_behaves_like 'ref comments'
|
|
end
|
|
|
|
context 'requesting with the escaped project full path' do
|
|
let(:project_id) { CGI.escape(project.full_path) }
|
|
|
|
it_behaves_like 'ref comments'
|
|
|
|
context 'when branch contains a dot' do
|
|
let(:commit) { project.repository.commit(branch_with_dot.name) }
|
|
let(:commit_id) { branch_with_dot.name }
|
|
|
|
it_behaves_like 'ref comments'
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when the commit is present on two projects' do
|
|
let(:forked_project) { create(:project, :repository, creator: guest, namespace: guest.namespace) }
|
|
let!(:forked_project_note) { create(:note_on_commit, author: guest, project: forked_project, commit_id: forked_project.repository.commit.id, note: 'a comment on a commit for fork') }
|
|
let(:project_id) { forked_project.id }
|
|
let(:commit_id) { forked_project.repository.commit.id }
|
|
|
|
it 'returns the comments for the target project' do
|
|
get api(route, guest)
|
|
|
|
expect(response).to have_gitlab_http_status(200)
|
|
expect(response).to match_response_schema('public_api/v4/commit_notes')
|
|
expect(json_response.size).to eq(1)
|
|
expect(json_response.first['note']).to eq('a comment on a commit for fork')
|
|
expect(json_response.first['author']['id']).to eq(guest.id)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'POST :id/repository/commits/:sha/cherry_pick' do
|
|
let(:commit) { project.commit('7d3b0f7cff5f37573aea97cebfd5692ea1689924') }
|
|
let(:commit_id) { commit.id }
|
|
let(:branch) { 'master' }
|
|
let(:route) { "/projects/#{project_id}/repository/commits/#{commit_id}/cherry_pick" }
|
|
|
|
shared_examples_for 'ref cherry-pick' do
|
|
context 'when ref exists' do
|
|
it 'cherry-picks the ref commit' do
|
|
post api(route, current_user), branch: branch
|
|
|
|
expect(response).to have_gitlab_http_status(201)
|
|
expect(response).to match_response_schema('public_api/v4/commit/basic')
|
|
expect(json_response['title']).to eq(commit.title)
|
|
expect(json_response['message']).to eq(commit.message)
|
|
expect(json_response['author_name']).to eq(commit.author_name)
|
|
expect(json_response['committer_name']).to eq(user.name)
|
|
end
|
|
end
|
|
|
|
context 'when repository is disabled' do
|
|
include_context 'disabled repository'
|
|
|
|
it_behaves_like '403 response' do
|
|
let(:request) { post api(route, current_user), branch: 'master' }
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when unauthenticated', 'and project is public' do
|
|
let(:project) { create(:project, :public, :repository) }
|
|
|
|
it_behaves_like '403 response' do
|
|
let(:request) { post api(route), branch: 'master' }
|
|
end
|
|
end
|
|
|
|
context 'when unauthenticated', 'and project is private' do
|
|
it_behaves_like '404 response' do
|
|
let(:request) { post api(route), branch: 'master' }
|
|
let(:message) { '404 Project Not Found' }
|
|
end
|
|
end
|
|
|
|
context 'when authenticated', 'as an owner' do
|
|
let(:current_user) { user }
|
|
|
|
it_behaves_like 'ref cherry-pick'
|
|
|
|
context 'when ref does not exist' do
|
|
let(:commit_id) { 'unknown' }
|
|
|
|
it_behaves_like '404 response' do
|
|
let(:request) { post api(route, current_user), branch: 'master' }
|
|
let(:message) { '404 Commit Not Found' }
|
|
end
|
|
end
|
|
|
|
context 'when branch is missing' do
|
|
it_behaves_like '400 response' do
|
|
let(:request) { post api(route, current_user) }
|
|
end
|
|
end
|
|
|
|
context 'when branch does not exist' do
|
|
it_behaves_like '404 response' do
|
|
let(:request) { post api(route, current_user), branch: 'foo' }
|
|
let(:message) { '404 Branch Not Found' }
|
|
end
|
|
end
|
|
|
|
context 'when commit is already included in the target branch' do
|
|
it_behaves_like '400 response' do
|
|
let(:request) { post api(route, current_user), branch: 'markdown' }
|
|
end
|
|
end
|
|
|
|
context 'when ref contains a dot' do
|
|
let(:commit) { project.repository.commit(branch_with_dot.name) }
|
|
let(:commit_id) { branch_with_dot.name }
|
|
|
|
it_behaves_like 'ref cherry-pick'
|
|
end
|
|
|
|
context 'when ref contains a slash' do
|
|
let(:commit_id) { branch_with_slash.name }
|
|
|
|
it_behaves_like '404 response' do
|
|
let(:request) { post api(route, current_user), branch: 'master' }
|
|
end
|
|
end
|
|
|
|
context 'requesting with the escaped project full path' do
|
|
let(:project_id) { CGI.escape(project.full_path) }
|
|
|
|
it_behaves_like 'ref cherry-pick'
|
|
|
|
context 'when ref contains a dot' do
|
|
let(:commit) { project.repository.commit(branch_with_dot.name) }
|
|
let(:commit_id) { branch_with_dot.name }
|
|
|
|
it_behaves_like 'ref cherry-pick'
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when authenticated', 'as a developer' do
|
|
let(:current_user) { guest }
|
|
|
|
before do
|
|
project.add_developer(guest)
|
|
end
|
|
|
|
context 'when branch is protected' do
|
|
before do
|
|
create(:protected_branch, project: project, name: 'feature')
|
|
end
|
|
|
|
it 'returns 400 if you are not allowed to push to the target branch' do
|
|
post api(route, current_user), branch: 'feature'
|
|
|
|
expect(response).to have_gitlab_http_status(400)
|
|
expect(json_response['message']).to eq('You are not allowed to push into this branch')
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'POST /projects/:id/repository/commits/:sha/comments' do
|
|
let(:commit) { project.repository.commit }
|
|
let(:commit_id) { commit.id }
|
|
let(:note) { 'My comment' }
|
|
let(:route) { "/projects/#{project_id}/repository/commits/#{commit_id}/comments" }
|
|
|
|
shared_examples_for 'ref new comment' do
|
|
context 'when ref exists' do
|
|
it 'creates the comment' do
|
|
post api(route, current_user), note: note
|
|
|
|
expect(response).to have_gitlab_http_status(201)
|
|
expect(response).to match_response_schema('public_api/v4/commit_note')
|
|
expect(json_response['note']).to eq('My comment')
|
|
expect(json_response['path']).to be_nil
|
|
expect(json_response['line']).to be_nil
|
|
expect(json_response['line_type']).to be_nil
|
|
end
|
|
end
|
|
|
|
context 'when repository is disabled' do
|
|
include_context 'disabled repository'
|
|
|
|
it_behaves_like '403 response' do
|
|
let(:request) { post api(route, current_user), note: 'My comment' }
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when unauthenticated', 'and project is public' do
|
|
let(:project) { create(:project, :public, :repository) }
|
|
|
|
it_behaves_like '400 response' do
|
|
let(:request) { post api(route), note: 'My comment' }
|
|
end
|
|
end
|
|
|
|
context 'when unauthenticated', 'and project is private' do
|
|
it_behaves_like '404 response' do
|
|
let(:request) { post api(route), note: 'My comment' }
|
|
let(:message) { '404 Project Not Found' }
|
|
end
|
|
end
|
|
|
|
context 'when authenticated', 'as an owner' do
|
|
let(:current_user) { user }
|
|
|
|
it_behaves_like 'ref new comment'
|
|
|
|
it 'returns the inline comment' do
|
|
post api(route, current_user), note: 'My comment', path: project.repository.commit.raw_diffs.first.new_path, line: 1, line_type: 'new'
|
|
|
|
expect(response).to have_gitlab_http_status(201)
|
|
expect(response).to match_response_schema('public_api/v4/commit_note')
|
|
expect(json_response['note']).to eq('My comment')
|
|
expect(json_response['path']).to eq(project.repository.commit.raw_diffs.first.new_path)
|
|
expect(json_response['line']).to eq(1)
|
|
expect(json_response['line_type']).to eq('new')
|
|
end
|
|
|
|
context 'when ref does not exist' do
|
|
let(:commit_id) { 'unknown' }
|
|
|
|
it_behaves_like '404 response' do
|
|
let(:request) { post api(route, current_user), note: 'My comment' }
|
|
let(:message) { '404 Commit Not Found' }
|
|
end
|
|
end
|
|
|
|
it 'returns 400 if note is missing' do
|
|
post api(route, current_user)
|
|
|
|
expect(response).to have_gitlab_http_status(400)
|
|
end
|
|
|
|
context 'when ref contains a dot' do
|
|
let(:commit_id) { branch_with_dot.name }
|
|
|
|
it_behaves_like 'ref new comment'
|
|
end
|
|
|
|
context 'when ref contains a slash' do
|
|
let(:commit_id) { branch_with_slash.name }
|
|
|
|
it_behaves_like '404 response' do
|
|
let(:request) { post api(route, current_user), note: 'My comment' }
|
|
end
|
|
end
|
|
|
|
context 'when ref contains an escaped slash' do
|
|
let(:commit_id) { CGI.escape(branch_with_slash.name) }
|
|
|
|
it_behaves_like 'ref new comment'
|
|
end
|
|
|
|
context 'requesting with the escaped project full path' do
|
|
let(:project_id) { CGI.escape(project.full_path) }
|
|
|
|
it_behaves_like 'ref new comment'
|
|
|
|
context 'when ref contains a dot' do
|
|
let(:commit_id) { branch_with_dot.name }
|
|
|
|
it_behaves_like 'ref new comment'
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|