ac382b5682
This commit introduces the usage of Common Table Expressions (CTEs) to efficiently retrieve nested group hierarchies, without having to rely on the "routes" table (which is an _incredibly_ inefficient way of getting the data). This requires a patch to ActiveRecord (found in the added initializer) to work properly as ActiveRecord doesn't support WITH statements properly out of the box. Unfortunately MySQL provides no efficient way of getting nested groups. For example, the old routes setup could easily take 5-10 seconds depending on the amount of "routes" in a database. Providing vastly different logic for both MySQL and PostgreSQL will negatively impact the development process. Because of this the various nested groups related methods return empty relations when used in combination with MySQL. For project authorizations the logic is split up into two classes: * Gitlab::ProjectAuthorizations::WithNestedGroups * Gitlab::ProjectAuthorizations::WithoutNestedGroups Both classes get the fresh project authorizations (= as they should be in the "project_authorizations" table), including nested groups if PostgreSQL is used. The logic of these two classes is quite different apart from their public interface. This complicates development a bit, but unfortunately there is no way around this. This commit also introduces Gitlab::GroupHierarchy. This class can be used to get the ancestors and descendants of a base relation, or both by using a UNION. This in turn is used by methods such as: * Namespace#ancestors * Namespace#descendants * User#all_expanded_groups Again this class relies on CTEs and thus only works on PostgreSQL. The Namespace methods will return an empty relation when MySQL is used, while User#all_expanded_groups will return only the groups a user is a direct member of. Performance wise the impact is quite large. For example, on GitLab.com Namespace#descendants used to take around 580 ms to retrieve data for a particular user. Using CTEs we are able to reduce this down to roughly 1 millisecond, returning the exact same data. == On The Fly Refreshing Refreshing of authorizations on the fly (= when users.authorized_projects_populated was not set) is removed with this commit. This simplifies the code, and ensures any queries used for authorizations are not mutated because they are executed in a Rails scope (e.g. Project.visible_to_user). This commit includes a migration to schedule refreshing authorizations for all users, ensuring all of them have their authorizations in place. Said migration schedules users in batches of 5000, with 5 minutes between every batch to smear the load around a bit. == Spec Changes This commit also introduces some changes to various specs. For example, some specs for ProjectTeam assumed that creating a personal project would _not_ lead to the owner having access, which is incorrect. Because we also no longer refresh authorizations on the fly for new users some code had to be added to the "empty_project" factory. This chunk of code ensures that the owner's permissions are refreshed after creating the project, something that is normally done in Projects::CreateService.
690 lines
24 KiB
Ruby
690 lines
24 KiB
Ruby
require 'spec_helper'
|
|
require 'mime/types'
|
|
|
|
describe API::Commits do
|
|
let(:user) { create(:user) }
|
|
let(:user2) { create(:user) }
|
|
let!(:project) { create(:project, :repository, creator: user, namespace: user.namespace) }
|
|
let!(:guest) { create(:project_member, :guest, user: user2, project: project) }
|
|
let!(:note) { create(:note_on_commit, author: user, project: project, commit_id: project.repository.commit.id, note: 'a comment on a commit') }
|
|
let!(:another_note) { create(:note_on_commit, author: user, project: project, commit_id: project.repository.commit.id, note: 'another comment on a commit') }
|
|
|
|
before { project.team << [user, :reporter] }
|
|
|
|
describe "List repository commits" do
|
|
context "authorized user" do
|
|
before { project.team << [user2, :reporter] }
|
|
|
|
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(json_response).to be_an Array
|
|
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(401)
|
|
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, user2)
|
|
|
|
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_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 a single commit" do
|
|
context "authorized user" do
|
|
it "returns a commit by sha" do
|
|
get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
|
|
|
|
expect(response).to have_http_status(200)
|
|
commit = project.repository.commit
|
|
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)
|
|
end
|
|
|
|
it "returns a 404 error if not found" do
|
|
get api("/projects/#{project.id}/repository/commits/invalid_sha", user)
|
|
expect(response).to have_http_status(404)
|
|
end
|
|
|
|
it "returns nil for commit without CI" do
|
|
get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
|
|
|
|
expect(response).to have_http_status(200)
|
|
expect(json_response['status']).to be_nil
|
|
end
|
|
|
|
it "returns status for CI" do
|
|
pipeline = project.ensure_pipeline('master', project.repository.commit.sha)
|
|
pipeline.update(status: 'success')
|
|
|
|
get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
|
|
|
|
expect(response).to have_http_status(200)
|
|
expect(json_response['status']).to eq(pipeline.status)
|
|
end
|
|
|
|
it "returns status for CI when pipeline is created" do
|
|
project.ensure_pipeline('master', project.repository.commit.sha)
|
|
|
|
get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
|
|
|
|
expect(response).to have_http_status(200)
|
|
expect(json_response['status']).to eq("created")
|
|
end
|
|
end
|
|
|
|
context "unauthorized user" do
|
|
it "does not return the selected commit" do
|
|
get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}")
|
|
expect(response).to have_http_status(401)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe "Get the diff of a commit" do
|
|
context "authorized user" do
|
|
before { project.team << [user2, :reporter] }
|
|
|
|
it "returns the diff of the selected commit" do
|
|
get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/diff", user)
|
|
expect(response).to have_http_status(200)
|
|
|
|
expect(json_response).to be_an Array
|
|
expect(json_response.length).to be >= 1
|
|
expect(json_response.first.keys).to include "diff"
|
|
end
|
|
|
|
it "returns a 404 error if invalid commit" do
|
|
get api("/projects/#{project.id}/repository/commits/invalid_sha/diff", user)
|
|
expect(response).to have_http_status(404)
|
|
end
|
|
end
|
|
|
|
context "unauthorized user" do
|
|
it "does not return the diff of the selected commit" do
|
|
get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/diff")
|
|
expect(response).to have_http_status(401)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'Get the comments of a commit' do
|
|
context 'authorized user' do
|
|
it 'returns merge_request comments' do
|
|
get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments", user)
|
|
expect(response).to have_http_status(200)
|
|
expect(response).to include_pagination_headers
|
|
expect(json_response).to be_an Array
|
|
expect(json_response.length).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
|
|
|
|
it 'returns a 404 error if merge_request_id not found' do
|
|
get api("/projects/#{project.id}/repository/commits/1234ab/comments", user)
|
|
expect(response).to have_http_status(404)
|
|
end
|
|
end
|
|
|
|
context 'unauthorized user' do
|
|
it 'does not return the diff of the selected commit' do
|
|
get api("/projects/#{project.id}/repository/commits/1234ab/comments")
|
|
expect(response).to have_http_status(401)
|
|
end
|
|
end
|
|
|
|
context 'when the commit is present on two projects' do
|
|
let(:forked_project) { create(:project, :repository, creator: user2, namespace: user2.namespace) }
|
|
let!(:forked_project_note) { create(:note_on_commit, author: user2, project: forked_project, commit_id: forked_project.repository.commit.id, note: 'a comment on a commit for fork') }
|
|
|
|
it 'returns the comments for the target project' do
|
|
get api("/projects/#{forked_project.id}/repository/commits/#{forked_project.repository.commit.id}/comments", user2)
|
|
|
|
expect(response).to have_http_status(200)
|
|
expect(json_response.length).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(user2.id)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'POST :id/repository/commits/:sha/cherry_pick' do
|
|
let(:master_pickable_commit) { project.commit('7d3b0f7cff5f37573aea97cebfd5692ea1689924') }
|
|
|
|
context 'authorized user' do
|
|
it 'cherry picks a commit' do
|
|
post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user), branch: 'master'
|
|
|
|
expect(response).to have_http_status(201)
|
|
expect(json_response['title']).to eq(master_pickable_commit.title)
|
|
expect(json_response['message']).to eq(master_pickable_commit.message)
|
|
expect(json_response['author_name']).to eq(master_pickable_commit.author_name)
|
|
expect(json_response['committer_name']).to eq(user.name)
|
|
end
|
|
|
|
it 'returns 400 if commit is already included in the target branch' do
|
|
post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user), branch: 'markdown'
|
|
|
|
expect(response).to have_http_status(400)
|
|
expect(json_response['message']).to include('Sorry, we cannot cherry-pick this commit automatically.')
|
|
end
|
|
|
|
it 'returns 400 if you are not allowed to push to the target branch' do
|
|
project.team << [user2, :developer]
|
|
protected_branch = create(:protected_branch, project: project, name: 'feature')
|
|
|
|
post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user2), branch: protected_branch.name
|
|
|
|
expect(response).to have_http_status(400)
|
|
expect(json_response['message']).to eq('You are not allowed to push into this branch')
|
|
end
|
|
|
|
it 'returns 400 for missing parameters' do
|
|
post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user)
|
|
|
|
expect(response).to have_http_status(400)
|
|
expect(json_response['error']).to eq('branch is missing')
|
|
end
|
|
|
|
it 'returns 404 if commit is not found' do
|
|
post api("/projects/#{project.id}/repository/commits/abcd0123/cherry_pick", user), branch: 'master'
|
|
|
|
expect(response).to have_http_status(404)
|
|
expect(json_response['message']).to eq('404 Commit Not Found')
|
|
end
|
|
|
|
it 'returns 404 if branch is not found' do
|
|
post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user), branch: 'foo'
|
|
|
|
expect(response).to have_http_status(404)
|
|
expect(json_response['message']).to eq('404 Branch Not Found')
|
|
end
|
|
|
|
it 'returns 400 for missing parameters' do
|
|
post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user)
|
|
|
|
expect(response).to have_http_status(400)
|
|
expect(json_response['error']).to eq('branch is missing')
|
|
end
|
|
end
|
|
|
|
context 'unauthorized user' do
|
|
it 'does not cherry pick the commit' do
|
|
post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick"), branch: 'master'
|
|
|
|
expect(response).to have_http_status(401)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'Post comment to commit' do
|
|
context 'authorized user' do
|
|
it 'returns comment' do
|
|
post api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments", user), note: 'My comment'
|
|
expect(response).to have_http_status(201)
|
|
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
|
|
|
|
it 'returns the inline comment' do
|
|
post api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments", user), note: 'My comment', path: project.repository.commit.raw_diffs.first.new_path, line: 1, line_type: 'new'
|
|
|
|
expect(response).to have_http_status(201)
|
|
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
|
|
|
|
it 'returns 400 if note is missing' do
|
|
post api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments", user)
|
|
expect(response).to have_http_status(400)
|
|
end
|
|
|
|
it 'returns 404 if note is attached to non existent commit' do
|
|
post api("/projects/#{project.id}/repository/commits/1234ab/comments", user), note: 'My comment'
|
|
expect(response).to have_http_status(404)
|
|
end
|
|
end
|
|
|
|
context 'unauthorized user' do
|
|
it 'does not return the diff of the selected commit' do
|
|
post api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments")
|
|
expect(response).to have_http_status(401)
|
|
end
|
|
end
|
|
end
|
|
end
|