mirror of
https://gitlab.com/gitlab-org/gitlab-foss.git
synced 2025-08-10 01:31:45 +00:00
440 lines
14 KiB
Ruby
440 lines
14 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'spec_helper'
|
|
|
|
RSpec.describe Projects::MergeRequestsController, feature_category: :source_code_management do
|
|
let_it_be(:merge_request) { create(:merge_request) }
|
|
let_it_be(:project) { merge_request.project }
|
|
let_it_be(:user) { merge_request.author }
|
|
|
|
describe 'GET #show' do
|
|
let_it_be(:group) { create(:group) }
|
|
let_it_be(:user) { create(:user) }
|
|
let_it_be(:project) { create(:project, :public, group: group) }
|
|
|
|
let(:merge_request) { create :merge_request, source_project: project, author: user }
|
|
|
|
context 'when the author of the merge request is banned', feature_category: :insider_threat do
|
|
let_it_be(:user) { create(:user, :banned) }
|
|
|
|
subject { response }
|
|
|
|
before do
|
|
get project_merge_request_path(project, merge_request)
|
|
end
|
|
|
|
it { is_expected.to have_gitlab_http_status(:not_found) }
|
|
end
|
|
|
|
context 'when diff version limit is reached' do
|
|
before do
|
|
stub_const('MergeRequest::DIFF_VERSION_LIMIT', 1)
|
|
end
|
|
|
|
it 'displays a warning' do
|
|
get project_merge_request_path(project, merge_request)
|
|
|
|
expect(flash[:alert]).to include('This merge request has reached the maximum limit')
|
|
expect(flash[:alert]).not_to include("This merge request has too many diff commits, and can't be updated")
|
|
end
|
|
|
|
context 'when "merge_requests_diffs_limit" feature flag is disabled' do
|
|
before do
|
|
stub_feature_flags(merge_requests_diffs_limit: false)
|
|
end
|
|
|
|
it 'does not display a warning' do
|
|
get project_merge_request_path(project, merge_request)
|
|
|
|
expect(flash[:alert]).to be_blank
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when diff commits limit is reached' do
|
|
before do
|
|
stub_const('MergeRequest::DIFF_COMMITS_LIMIT', 1)
|
|
# merge_request_diff model has a after_save callback that nullifies commits counts
|
|
# using #update_column to override this behavior
|
|
merge_request.merge_request_diff.update_column(:commits_count, 2)
|
|
end
|
|
|
|
it 'displays a warning' do
|
|
get project_merge_request_path(project, merge_request)
|
|
|
|
expect(flash[:alert]).to include("This merge request has too many diff commits, and can't be updated")
|
|
end
|
|
|
|
context 'when "merge_requests_diff_commits_limit" feature flag is disabled' do
|
|
before do
|
|
stub_feature_flags(merge_requests_diff_commits_limit: false)
|
|
end
|
|
|
|
it 'does not display a warning' do
|
|
get project_merge_request_path(project, merge_request)
|
|
|
|
expect(flash[:alert]).to be_blank
|
|
end
|
|
end
|
|
|
|
context 'when diff version limit is also reached' do
|
|
before do
|
|
stub_const('MergeRequest::DIFF_VERSION_LIMIT', 1)
|
|
end
|
|
|
|
it 'displays only one warning' do
|
|
get project_merge_request_path(project, merge_request)
|
|
|
|
expect(flash[:alert]).to include('This merge request has reached the maximum limit')
|
|
expect(flash[:alert]).not_to include("This merge request has too many diff commits, and can't be updated")
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'GET #index' do
|
|
let_it_be(:public_project) { create(:project, :public) }
|
|
|
|
it_behaves_like 'rate limited endpoint', rate_limit_key: :search_rate_limit do
|
|
let_it_be(:current_user) { user }
|
|
|
|
before do
|
|
sign_in current_user
|
|
end
|
|
|
|
def request
|
|
get project_merge_requests_path(public_project), params: { scope: 'all', search: 'test' }
|
|
end
|
|
end
|
|
|
|
it_behaves_like 'rate limited endpoint', rate_limit_key: :search_rate_limit_unauthenticated do
|
|
def request
|
|
get project_merge_requests_path(public_project), params: { scope: 'all', search: 'test' }
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'GET #discussions' do
|
|
let_it_be(:discussion) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project) }
|
|
let_it_be(:discussion_reply) do
|
|
create(:discussion_note_on_merge_request, noteable: merge_request, project: project, in_reply_to: discussion)
|
|
end
|
|
|
|
let_it_be(:state_event) { create(:resource_state_event, merge_request: merge_request) }
|
|
let_it_be(:discussion_2) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project) }
|
|
let_it_be(:discussion_3) { create(:diff_note_on_merge_request, noteable: merge_request, project: project) }
|
|
|
|
before do
|
|
login_as(user)
|
|
end
|
|
|
|
context 'pagination' do
|
|
def get_discussions(**params)
|
|
get discussions_project_merge_request_path(project, merge_request, params: params.merge(format: :json))
|
|
end
|
|
|
|
it 'returns paginated notes and cursor based on per_page param' do
|
|
get_discussions(per_page: 2)
|
|
|
|
discussions = Gitlab::Json.parse(response.body)
|
|
notes = discussions.flat_map { |d| d['notes'] }
|
|
|
|
expect(discussions.count).to eq(2)
|
|
expect(notes).to match(
|
|
[
|
|
a_hash_including('id' => discussion.id.to_s),
|
|
a_hash_including('id' => discussion_reply.id.to_s),
|
|
a_hash_including('type' => 'StateNote')
|
|
])
|
|
|
|
cursor = response.header['X-Next-Page-Cursor']
|
|
expect(cursor).to be_present
|
|
|
|
get_discussions(per_page: 1, cursor: cursor)
|
|
|
|
discussions = Gitlab::Json.parse(response.body)
|
|
notes = discussions.flat_map { |d| d['notes'] }
|
|
|
|
expect(discussions.count).to eq(1)
|
|
expect(notes).to match([a_hash_including('id' => discussion_2.id.to_s)])
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'token authentication' do
|
|
context 'when public project' do
|
|
let_it_be(:public_project) { create(:project, :public) }
|
|
|
|
it_behaves_like 'authenticates sessionless user for the request spec', 'index atom', public_resource: true do
|
|
let(:url) { project_merge_requests_url(public_project, format: :atom) }
|
|
end
|
|
end
|
|
|
|
context 'when private project' do
|
|
let_it_be(:private_project) { create(:project, :private) }
|
|
|
|
it_behaves_like 'authenticates sessionless user for the request spec', 'index atom',
|
|
public_resource: false,
|
|
ignore_metrics: true do
|
|
let(:url) { project_merge_requests_url(private_project, format: :atom) }
|
|
|
|
before do
|
|
private_project.add_maintainer(user)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'GET #pipelines.json' do
|
|
before do
|
|
login_as(user)
|
|
end
|
|
|
|
it 'avoids N+1 queries', :use_sql_query_cache do
|
|
create_pipeline
|
|
|
|
# warm up
|
|
get pipelines_project_merge_request_path(project, merge_request, format: :json)
|
|
|
|
control = ActiveRecord::QueryRecorder.new(skip_cached: false) do
|
|
get pipelines_project_merge_request_path(project, merge_request, format: :json)
|
|
end
|
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
|
expect(Gitlab::Json.parse(response.body)['count']['all']).to eq(1)
|
|
|
|
create_pipeline
|
|
|
|
expect do
|
|
get pipelines_project_merge_request_path(project, merge_request, format: :json)
|
|
end.to issue_same_number_of_queries_as(control)
|
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
|
expect(Gitlab::Json.parse(response.body)['count']['all']).to eq(2)
|
|
end
|
|
|
|
context 'when there are pipelines with failed builds' do
|
|
before do
|
|
pipeline = create_pipeline
|
|
|
|
create(:ci_build, :failed, pipeline: pipeline)
|
|
create(:ci_build, :failed, pipeline: pipeline)
|
|
end
|
|
|
|
it 'returns the failed build count but not the failed builds' do
|
|
get pipelines_project_merge_request_path(project, merge_request, format: :json)
|
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
|
expect(Gitlab::Json.parse(response.body)['pipelines'].size).to eq(1)
|
|
expect(Gitlab::Json.parse(response.body)['pipelines'][0]['failed_builds_count']).to eq(2)
|
|
expect(Gitlab::Json.parse(response.body)['pipelines'][0]).not_to have_key('failed_builds')
|
|
end
|
|
|
|
it 'avoids N+1 queries', :use_sql_query_cache do
|
|
# warm up
|
|
get pipelines_project_merge_request_path(project, merge_request, format: :json)
|
|
|
|
control = ActiveRecord::QueryRecorder.new(skip_cached: false) do
|
|
get pipelines_project_merge_request_path(project, merge_request, format: :json)
|
|
end
|
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
|
expect(Gitlab::Json.parse(response.body)['count']['all']).to eq(1)
|
|
|
|
pipeline_2 = create_pipeline
|
|
create(:ci_build, :failed, pipeline: pipeline_2)
|
|
create(:ci_build, :failed, pipeline: pipeline_2)
|
|
|
|
expect do
|
|
get pipelines_project_merge_request_path(project, merge_request, format: :json)
|
|
end.to issue_same_number_of_queries_as(control)
|
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
|
expect(Gitlab::Json.parse(response.body)['count']['all']).to eq(2)
|
|
end
|
|
end
|
|
|
|
describe '#rapid_diffs' do
|
|
it 'returns 200' do
|
|
get diffs_project_merge_request_path(project, merge_request, rapid_diffs: 'true')
|
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
|
expect(response.body).to include('data-page="projects:merge_requests:rapid_diffs"')
|
|
end
|
|
|
|
it 'uses diffs action when rapid_diffs query parameter doesnt exist' do
|
|
get diffs_project_merge_request_path(project, merge_request)
|
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
|
expect(response.body).to include('data-page="projects:merge_requests:diffs"')
|
|
end
|
|
|
|
it 'shows only first 5 files' do
|
|
get diffs_project_merge_request_path(project, merge_request, rapid_diffs: 'true')
|
|
|
|
expect(response.body.scan('<diff-file ').size).to eq(5)
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def create_pipeline
|
|
create(
|
|
:ci_pipeline, :with_job, :success,
|
|
project: merge_request.source_project,
|
|
ref: merge_request.source_branch,
|
|
sha: merge_request.diff_head_sha
|
|
)
|
|
end
|
|
end
|
|
|
|
describe 'GET #diff_files_metadata' do
|
|
before do
|
|
project.add_developer(user)
|
|
login_as(user)
|
|
end
|
|
|
|
let(:send_request) { get diff_files_metadata_project_merge_request_path(project, merge_request) }
|
|
|
|
include_examples 'diff files metadata'
|
|
|
|
context 'when merge_request_diff does not exist' do
|
|
let(:merge_request) { create(:merge_request, :skip_diff_creation, author: user) }
|
|
let(:project) { merge_request.project }
|
|
|
|
it 'returns an empty array' do
|
|
send_request
|
|
|
|
expect(json_response['diff_files']).to be_empty
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'GET #diffs_stats' do
|
|
before do
|
|
project.add_developer(user)
|
|
login_as(user)
|
|
end
|
|
|
|
let(:additional_params) { {} }
|
|
let(:send_request) { get diffs_stats_project_merge_request_path(project, merge_request, params: additional_params) }
|
|
|
|
include_examples 'diffs stats' do
|
|
let(:expected_stats) do
|
|
{
|
|
added_lines: 118,
|
|
removed_lines: 9,
|
|
diffs_count: 20
|
|
}
|
|
end
|
|
end
|
|
|
|
context 'when diffs overflow' do
|
|
include_examples 'overflow' do
|
|
let(:expected_stats) do
|
|
{
|
|
visible_count: 20,
|
|
email_path: "/#{project.full_path}/-/merge_requests/1.patch",
|
|
diff_path: "/#{project.full_path}/-/merge_requests/1.diff"
|
|
}
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when merge_request_diff does not exist' do
|
|
let(:merge_request) { create(:merge_request, :skip_diff_creation, author: user) }
|
|
let(:project) { merge_request.project }
|
|
|
|
it 'returns an empty array' do
|
|
send_request
|
|
|
|
expect(json_response['diffs_stats']).to eq({ "added_lines" => 0, "removed_lines" => 0, "diffs_count" => 0 })
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'GET #diff_file' do
|
|
before do
|
|
project.add_developer(user)
|
|
login_as(user)
|
|
end
|
|
|
|
let_it_be(:merge_request) { create(:merge_request, author: user) }
|
|
let(:diff_file_path) { diff_file_project_merge_request_path(project, merge_request) }
|
|
let(:diff_file) { merge_request.merge_request_diff.diffs.diff_files.first }
|
|
let(:old_path) { diff_file.old_path }
|
|
let(:new_path) { diff_file.new_path }
|
|
let(:ignore_whitespace_changes) { false }
|
|
let(:view) { 'inline' }
|
|
|
|
let(:params) do
|
|
{
|
|
old_path: old_path,
|
|
new_path: new_path,
|
|
ignore_whitespace_changes: ignore_whitespace_changes,
|
|
view: view
|
|
}.compact
|
|
end
|
|
|
|
let(:send_request) { get diff_file_path, params: params }
|
|
|
|
include_examples 'diff file endpoint'
|
|
|
|
context 'with whitespace-only diffs' do
|
|
let(:ignore_whitespace_changes) { true }
|
|
let(:diffs_collection) { instance_double(Gitlab::Diff::FileCollection::Base, diff_files: [diff_file]) }
|
|
|
|
before do
|
|
allow(diff_file).to receive(:whitespace_only?).and_return(true)
|
|
end
|
|
|
|
it 'makes a call to diffs_resource with ignore_whitespace_change: false' do
|
|
expect_next_instance_of(described_class) do |instance|
|
|
allow(instance).to receive(:diffs_resource).and_return(diffs_collection)
|
|
|
|
expect(instance).to receive(:diffs_resource).with(
|
|
hash_including(ignore_whitespace_change: false)
|
|
).and_return(diffs_collection)
|
|
end
|
|
|
|
send_request
|
|
|
|
expect(response).to have_gitlab_http_status(:success)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'PUT #update' do
|
|
before do
|
|
project.add_developer(user)
|
|
login_as(user)
|
|
end
|
|
|
|
it 'applies correct timezone to merge_after' do
|
|
put project_merge_request_path(project, merge_request, merge_request: { merge_after: '2024-09-03T21:18' })
|
|
|
|
expect(response).to redirect_to(project_merge_request_path(project, merge_request))
|
|
|
|
expect(merge_request.reload.merge_schedule.merge_after).to eq(
|
|
Time.zone.parse('2024-09-03T21:18')
|
|
)
|
|
end
|
|
|
|
it 'resets merge_schedule if merge_after is not set' do
|
|
create(:merge_request_merge_schedule, merge_request: merge_request, merge_after: '2024-10-27T21:06')
|
|
|
|
expect do
|
|
put project_merge_request_path(project, merge_request, merge_request: { merge_after: '' })
|
|
end.to change { merge_request.reload.merge_schedule }.to(nil)
|
|
end
|
|
|
|
it 'does not reset merge_schedule if merge_after is not sent' do
|
|
create(:merge_request_merge_schedule, merge_request: merge_request, merge_after: '2024-10-27T21:06')
|
|
|
|
expect do
|
|
put project_merge_request_path(project, merge_request, merge_request: { title: 'Something' })
|
|
end.not_to change { merge_request.reload.merge_schedule.merge_after }
|
|
end
|
|
end
|
|
end
|