debian-mirror-gitlab/spec/controllers/projects/merge_requests/creations_controller_spec.rb

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

310 lines
9.7 KiB
Ruby
Raw Normal View History

2019-07-31 22:56:46 +05:30
# frozen_string_literal: true
2017-09-10 17:25:29 +05:30
require 'spec_helper'
2020-06-23 00:09:42 +05:30
RSpec.describe Projects::MergeRequests::CreationsController do
2017-09-10 17:25:29 +05:30
let(:project) { create(:project, :repository) }
2022-04-04 11:22:00 +05:30
let(:user) { project.first_owner }
2017-09-10 17:25:29 +05:30
let(:fork_project) { create(:forked_project_with_submodules) }
2018-03-17 18:26:18 +05:30
let(:get_diff_params) do
{
namespace_id: fork_project.namespace.to_param,
project_id: fork_project,
merge_request: {
source_branch: 'remove-submodule',
target_branch: 'master'
}
}
end
2017-09-10 17:25:29 +05:30
before do
2018-11-18 11:00:15 +05:30
fork_project.add_maintainer(user)
2018-03-27 19:54:05 +05:30
Projects::ForkService.new(project, user).execute(fork_project)
2017-09-10 17:25:29 +05:30
sign_in(user)
end
describe 'GET new' do
context 'merge request that removes a submodule' do
it 'renders new merge request widget template' do
2019-02-15 15:39:39 +05:30
get :new, params: get_diff_params
2018-03-17 18:26:18 +05:30
2019-12-04 20:38:33 +05:30
expect(response).to be_successful
2018-03-17 18:26:18 +05:30
end
end
2018-11-20 20:47:30 +05:30
context 'merge request with some commits' do
render_views
let(:large_diff_params) do
{
namespace_id: fork_project.namespace.to_param,
project_id: fork_project,
merge_request: {
source_branch: 'master',
target_branch: 'fix'
}
}
end
describe 'with artificial limits' do
before do
# Load MergeRequestdiff so stub_const won't override it with its own definition
# See https://github.com/rspec/rspec-mocks/issues/1079
stub_const("#{MergeRequestDiff}::COMMITS_SAFE_SIZE", 2)
end
it 'limits total commits' do
2019-02-15 15:39:39 +05:30
get :new, params: large_diff_params
2018-11-20 20:47:30 +05:30
2019-12-04 20:38:33 +05:30
expect(response).to be_successful
2018-11-20 20:47:30 +05:30
total = assigns(:total_commit_count)
expect(assigns(:commits)).to be_an Array
expect(total).to be > 0
expect(assigns(:hidden_commit_count)).to be > 0
2020-03-13 15:44:24 +05:30
expect(response).to have_gitlab_http_status(:ok)
2018-11-20 20:47:30 +05:30
expect(response.body).to match %r(<span class="commits-count">2 commits</span>)
end
end
it 'shows total commits' do
2019-02-15 15:39:39 +05:30
get :new, params: large_diff_params
2018-11-20 20:47:30 +05:30
2019-12-04 20:38:33 +05:30
expect(response).to be_successful
2018-11-20 20:47:30 +05:30
total = assigns(:total_commit_count)
2019-03-02 22:35:43 +05:30
expect(assigns(:commits)).to be_an CommitCollection
2018-11-20 20:47:30 +05:30
expect(total).to be > 0
expect(assigns(:hidden_commit_count)).to eq(0)
2020-03-13 15:44:24 +05:30
expect(response).to have_gitlab_http_status(:ok)
2018-11-20 20:47:30 +05:30
expect(response.body).to match %r(<span class="commits-count">#{total} commits</span>)
end
end
2018-03-17 18:26:18 +05:30
end
describe 'GET diffs' do
context 'when merge request cannot be created' do
it 'does not assign diffs var' do
2019-12-26 22:10:19 +05:30
allow_next_instance_of(MergeRequest) do |instance|
allow(instance).to receive(:can_be_created).and_return(false)
end
2018-03-17 18:26:18 +05:30
2019-02-15 15:39:39 +05:30
get :diffs, params: get_diff_params.merge(format: 'json')
2017-09-10 17:25:29 +05:30
2019-12-04 20:38:33 +05:30
expect(response).to be_successful
2018-03-17 18:26:18 +05:30
expect(assigns[:diffs]).to be_nil
2017-09-10 17:25:29 +05:30
end
end
end
describe 'GET pipelines' do
before do
create(:ci_pipeline, sha: fork_project.commit('remove-submodule').id,
ref: 'remove-submodule',
project: fork_project)
end
it 'renders JSON including serialized pipelines' do
2019-02-15 15:39:39 +05:30
get :pipelines, params: get_diff_params.merge(format: 'json')
2017-09-10 17:25:29 +05:30
expect(response).to be_ok
expect(json_response).to have_key 'pipelines'
expect(json_response['pipelines']).not_to be_empty
end
end
describe 'GET diff_for_path' do
def diff_for_path(extra_params = {})
params = {
namespace_id: project.namespace.to_param,
project_id: project,
format: 'json'
}
2019-02-15 15:39:39 +05:30
get :diff_for_path, params: params.merge(extra_params)
2017-09-10 17:25:29 +05:30
end
let(:existing_path) { 'files/ruby/feature.rb' }
context 'when both branches are in the same project' do
it 'disables diff notes' do
diff_for_path(old_path: existing_path, new_path: existing_path, merge_request: { source_branch: 'feature', target_branch: 'master' })
expect(assigns(:diff_notes_disabled)).to be_truthy
end
it 'only renders the diffs for the path given' do
expect(controller).to receive(:render_diff_for_path).and_wrap_original do |meth, diffs|
expect(diffs.diff_files.map(&:new_path)).to contain_exactly(existing_path)
meth.call(diffs)
end
diff_for_path(old_path: existing_path, new_path: existing_path, merge_request: { source_branch: 'feature', target_branch: 'master' })
end
end
context 'when the source branch is in a different project to the target' do
let(:other_project) { create(:project, :repository) }
before do
2018-11-18 11:00:15 +05:30
other_project.add_maintainer(user)
2017-09-10 17:25:29 +05:30
end
context 'when the path exists in the diff' do
it 'disables diff notes' do
diff_for_path(old_path: existing_path, new_path: existing_path, merge_request: { source_project: other_project, source_branch: 'feature', target_branch: 'master' })
expect(assigns(:diff_notes_disabled)).to be_truthy
end
it 'only renders the diffs for the path given' do
expect(controller).to receive(:render_diff_for_path).and_wrap_original do |meth, diffs|
expect(diffs.diff_files.map(&:new_path)).to contain_exactly(existing_path)
meth.call(diffs)
end
diff_for_path(old_path: existing_path, new_path: existing_path, merge_request: { source_project: other_project, source_branch: 'feature', target_branch: 'master' })
end
end
context 'when the path does not exist in the diff' do
before do
diff_for_path(old_path: 'files/ruby/nopen.rb', new_path: 'files/ruby/nopen.rb', merge_request: { source_project: other_project, source_branch: 'feature', target_branch: 'master' })
end
it 'returns a 404' do
2020-03-13 15:44:24 +05:30
expect(response).to have_gitlab_http_status(:not_found)
2017-09-10 17:25:29 +05:30
end
end
end
end
2018-03-27 19:54:05 +05:30
describe 'GET #branch_to' do
before do
allow(Ability).to receive(:allowed?).and_call_original
end
it 'fetches the commit if a user has access' do
expect(Ability).to receive(:allowed?).with(user, :read_project, project) { true }
2022-04-01 21:47:47 +05:30
expect(Ability).to receive(:allowed?).with(user, :create_merge_request_in, project) { true }.at_least(:once)
2018-03-27 19:54:05 +05:30
get :branch_to,
2019-02-15 15:39:39 +05:30
params: {
namespace_id: fork_project.namespace,
project_id: fork_project,
target_project_id: project.id,
ref: 'master'
}
2018-03-27 19:54:05 +05:30
expect(assigns(:commit)).not_to be_nil
2020-03-13 15:44:24 +05:30
expect(response).to have_gitlab_http_status(:ok)
2018-03-27 19:54:05 +05:30
end
2022-04-01 21:47:47 +05:30
it 'does not load the commit when the user cannot create_merge_request_in' do
expect(Ability).to receive(:allowed?).with(user, :read_project, project) { true }
expect(Ability).to receive(:allowed?).with(user, :create_merge_request_in, project) { false }.at_least(:once)
get :branch_to,
params: {
namespace_id: fork_project.namespace,
project_id: fork_project,
target_project_id: project.id,
ref: 'master'
}
expect(assigns(:commit)).to be_nil
expect(response).to have_gitlab_http_status(:ok)
end
2018-03-27 19:54:05 +05:30
it 'does not load the commit when the user cannot read the project' do
expect(Ability).to receive(:allowed?).with(user, :read_project, project) { false }
2022-04-01 21:47:47 +05:30
expect(Ability).to receive(:allowed?).with(user, :create_merge_request_in, project) { true }.at_least(:once)
2018-03-27 19:54:05 +05:30
get :branch_to,
2019-02-15 15:39:39 +05:30
params: {
namespace_id: fork_project.namespace,
project_id: fork_project,
target_project_id: project.id,
ref: 'master'
}
2018-03-27 19:54:05 +05:30
expect(assigns(:commit)).to be_nil
2020-03-13 15:44:24 +05:30
expect(response).to have_gitlab_http_status(:ok)
2018-03-27 19:54:05 +05:30
end
2021-04-29 21:17:54 +05:30
context 'no target_project_id provided' do
before do
project.add_maintainer(user)
end
it 'selects itself as a target project' do
get :branch_to,
params: {
namespace_id: project.namespace,
project_id: project,
ref: 'master'
}
expect(assigns(:target_project)).to eq(project)
expect(response).to have_gitlab_http_status(:ok)
end
context 'project is a fork' do
it 'calls to project defaults to selects a correct target project' do
get :branch_to,
params: {
namespace_id: fork_project.namespace,
project_id: fork_project,
ref: 'master'
}
expect(assigns(:target_project)).to eq(project)
expect(response).to have_gitlab_http_status(:ok)
end
end
end
2018-03-27 19:54:05 +05:30
end
2019-10-12 21:52:04 +05:30
describe 'POST create' do
let(:params) do
{
namespace_id: fork_project.namespace.to_param,
project_id: fork_project,
merge_request: {
title: 'Test merge request',
source_branch: 'remove-submodule',
target_branch: 'master'
}
}
end
it 'creates merge request' do
expect do
post_request(params)
end.to change { MergeRequest.count }.by(1)
end
context 'when the merge request is not created from the web ide' do
it 'counter is not increased' do
expect(Gitlab::UsageDataCounters::WebIdeCounter).not_to receive(:increment_merge_requests_count)
post_request(params)
end
end
context 'when the merge request is created from the web ide' do
let(:nav_source) { { nav_source: 'webide' } }
it 'counter is increased' do
expect(Gitlab::UsageDataCounters::WebIdeCounter).to receive(:increment_merge_requests_count)
post_request(params.merge(nav_source))
end
end
def post_request(merge_request_params)
post :create, params: merge_request_params
end
end
2017-09-10 17:25:29 +05:30
end