902 lines
27 KiB
Ruby
902 lines
27 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe Projects::MergeRequestsController do
|
|
include ProjectForksHelper
|
|
|
|
let(:project) { create(:project, :repository) }
|
|
let(:user) { project.owner }
|
|
let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }
|
|
let(:merge_request_with_conflicts) do
|
|
create(:merge_request, source_branch: 'conflict-resolvable', target_branch: 'conflict-start', source_project: project, merge_status: :unchecked) do |mr|
|
|
mr.mark_as_unmergeable
|
|
end
|
|
end
|
|
|
|
before do
|
|
sign_in(user)
|
|
end
|
|
|
|
describe 'GET commit_change_content' do
|
|
it 'renders commit_change_content template' do
|
|
get :commit_change_content,
|
|
namespace_id: project.namespace.to_param,
|
|
project_id: project,
|
|
id: merge_request.iid,
|
|
format: 'html'
|
|
|
|
expect(response).to render_template('_commit_change_content')
|
|
end
|
|
end
|
|
|
|
shared_examples "loads labels" do |action|
|
|
it "loads labels into the @labels variable" do
|
|
get action,
|
|
namespace_id: project.namespace.to_param,
|
|
project_id: project,
|
|
id: merge_request.iid,
|
|
format: 'html'
|
|
expect(assigns(:labels)).not_to be_nil
|
|
end
|
|
end
|
|
|
|
describe "GET show" do
|
|
def go(extra_params = {})
|
|
params = {
|
|
namespace_id: project.namespace.to_param,
|
|
project_id: project,
|
|
id: merge_request.iid
|
|
}
|
|
|
|
get :show, params.merge(extra_params)
|
|
end
|
|
|
|
it_behaves_like "loads labels", :show
|
|
|
|
describe 'as html' do
|
|
context 'when diff files were cleaned' do
|
|
render_views
|
|
|
|
it 'renders page when diff size is not persisted and diff_refs does not exist' do
|
|
diff = merge_request.merge_request_diff
|
|
|
|
diff.clean!
|
|
diff.update!(real_size: nil,
|
|
start_commit_sha: nil,
|
|
base_commit_sha: nil)
|
|
|
|
go(format: :html)
|
|
|
|
expect(response).to be_success
|
|
end
|
|
end
|
|
|
|
it "renders merge request page" do
|
|
go(format: :html)
|
|
|
|
expect(response).to be_success
|
|
end
|
|
|
|
context "loads notes" do
|
|
let(:first_contributor) { create(:user) }
|
|
let(:contributor) { create(:user) }
|
|
let(:merge_request) { create(:merge_request, author: first_contributor, target_project: project, source_project: project) }
|
|
let(:contributor_merge_request) { create(:merge_request, :merged, author: contributor, target_project: project, source_project: project) }
|
|
# the order here is important
|
|
# as the controller reloads these from DB, references doesn't correspond after
|
|
let!(:first_contributor_note) { create(:note, author: first_contributor, noteable: merge_request, project: project) }
|
|
let!(:contributor_note) { create(:note, author: contributor, noteable: merge_request, project: project) }
|
|
let!(:owner_note) { create(:note, author: user, noteable: merge_request, project: project) }
|
|
|
|
it "with special_role FIRST_TIME_CONTRIBUTOR" do
|
|
go(format: :html)
|
|
|
|
notes = assigns(:notes)
|
|
expect(notes).to match(a_collection_containing_exactly(an_object_having_attributes(special_role: Note::SpecialRole::FIRST_TIME_CONTRIBUTOR),
|
|
an_object_having_attributes(special_role: nil),
|
|
an_object_having_attributes(special_role: nil)
|
|
))
|
|
end
|
|
end
|
|
|
|
context "that is invalid" do
|
|
let(:merge_request) { create(:invalid_merge_request, target_project: project, source_project: project) }
|
|
|
|
it "renders merge request page" do
|
|
go(format: :html)
|
|
|
|
expect(response).to be_success
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'as json' do
|
|
context 'with basic serializer param' do
|
|
it 'renders basic MR entity as json' do
|
|
go(serializer: 'basic', format: :json)
|
|
|
|
expect(response).to match_response_schema('entities/merge_request_basic')
|
|
end
|
|
end
|
|
|
|
context 'with widget serializer param' do
|
|
it 'renders widget MR entity as json' do
|
|
go(serializer: 'widget', format: :json)
|
|
|
|
expect(response).to match_response_schema('entities/merge_request_widget')
|
|
end
|
|
end
|
|
|
|
context 'when no serialiser was passed' do
|
|
it 'renders widget MR entity as json' do
|
|
go(serializer: nil, format: :json)
|
|
|
|
expect(response).to match_response_schema('entities/merge_request_widget')
|
|
end
|
|
end
|
|
|
|
context "that is invalid" do
|
|
let(:merge_request) { create(:invalid_merge_request, target_project: project, source_project: project) }
|
|
|
|
it "renders merge request page" do
|
|
go(format: :json)
|
|
|
|
expect(response).to be_success
|
|
end
|
|
end
|
|
end
|
|
|
|
describe "as diff" do
|
|
it "triggers workhorse to serve the request" do
|
|
go(format: :diff)
|
|
|
|
expect(response.headers[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with("git-diff:")
|
|
end
|
|
end
|
|
|
|
describe "as patch" do
|
|
it 'triggers workhorse to serve the request' do
|
|
go(format: :patch)
|
|
|
|
expect(response.headers[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with("git-format-patch:")
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'GET index' do
|
|
let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }
|
|
|
|
def get_merge_requests(page = nil)
|
|
get :index,
|
|
namespace_id: project.namespace.to_param,
|
|
project_id: project,
|
|
state: 'opened', page: page.to_param
|
|
end
|
|
|
|
it_behaves_like "issuables list meta-data", :merge_request
|
|
|
|
context 'when page param' do
|
|
let(:last_page) { project.merge_requests.page().total_pages }
|
|
let!(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }
|
|
|
|
it 'redirects to last_page if page number is larger than number of pages' do
|
|
get_merge_requests(last_page + 1)
|
|
|
|
expect(response).to redirect_to(namespace_project_merge_requests_path(page: last_page, state: controller.params[:state], scope: controller.params[:scope]))
|
|
end
|
|
|
|
it 'redirects to specified page' do
|
|
get_merge_requests(last_page)
|
|
|
|
expect(assigns(:merge_requests).current_page).to eq(last_page)
|
|
expect(response).to have_gitlab_http_status(200)
|
|
end
|
|
|
|
it 'does not redirect to external sites when provided a host field' do
|
|
external_host = "www.example.com"
|
|
get :index,
|
|
namespace_id: project.namespace.to_param,
|
|
project_id: project,
|
|
state: 'opened',
|
|
page: (last_page + 1).to_param,
|
|
host: external_host
|
|
|
|
expect(response).to redirect_to(namespace_project_merge_requests_path(page: last_page, state: controller.params[:state], scope: controller.params[:scope]))
|
|
end
|
|
end
|
|
|
|
context 'when filtering by opened state' do
|
|
context 'with opened merge requests' do
|
|
it 'lists those merge requests' do
|
|
expect(merge_request).to be_persisted
|
|
|
|
get_merge_requests
|
|
|
|
expect(assigns(:merge_requests)).to include(merge_request)
|
|
end
|
|
end
|
|
|
|
context 'with reopened merge requests' do
|
|
before do
|
|
merge_request.close!
|
|
merge_request.reopen!
|
|
end
|
|
|
|
it 'lists those merge requests' do
|
|
get_merge_requests
|
|
|
|
expect(assigns(:merge_requests)).to include(merge_request)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'PUT update' do
|
|
def update_merge_request(mr_params, additional_params = {})
|
|
params = {
|
|
namespace_id: project.namespace,
|
|
project_id: project,
|
|
id: merge_request.iid,
|
|
merge_request: mr_params
|
|
}.merge(additional_params)
|
|
|
|
put :update, params
|
|
end
|
|
|
|
context 'changing the assignee' do
|
|
it 'limits the attributes exposed on the assignee' do
|
|
assignee = create(:user)
|
|
project.add_developer(assignee)
|
|
|
|
update_merge_request({ assignee_id: assignee.id }, format: :json)
|
|
body = JSON.parse(response.body)
|
|
|
|
expect(body['assignee'].keys)
|
|
.to match_array(%w(name username avatar_url id state web_url))
|
|
end
|
|
end
|
|
|
|
context 'when user does not have access to update issue' do
|
|
before do
|
|
reporter = create(:user)
|
|
project.add_reporter(reporter)
|
|
sign_in(reporter)
|
|
end
|
|
|
|
it 'responds with 404' do
|
|
update_merge_request(title: 'New title')
|
|
|
|
expect(response).to have_http_status(:not_found)
|
|
end
|
|
end
|
|
|
|
context 'there is no source project' do
|
|
let(:project) { create(:project, :repository) }
|
|
let(:forked_project) { fork_project_with_submodules(project) }
|
|
let!(:merge_request) { create(:merge_request, source_project: forked_project, source_branch: 'add-submodule-version-bump', target_branch: 'master', target_project: project) }
|
|
|
|
before do
|
|
forked_project.destroy
|
|
end
|
|
|
|
it 'closes MR without errors' do
|
|
update_merge_request(state_event: 'close')
|
|
|
|
expect(response).to redirect_to([merge_request.target_project.namespace.becomes(Namespace), merge_request.target_project, merge_request])
|
|
expect(merge_request.reload.closed?).to be_truthy
|
|
end
|
|
|
|
it 'allows editing of a closed merge request' do
|
|
merge_request.close!
|
|
|
|
update_merge_request(title: 'New title')
|
|
|
|
expect(response).to redirect_to([merge_request.target_project.namespace.becomes(Namespace), merge_request.target_project, merge_request])
|
|
expect(merge_request.reload.title).to eq 'New title'
|
|
end
|
|
|
|
it 'does not allow to update target branch closed merge request' do
|
|
merge_request.close!
|
|
|
|
update_merge_request(target_branch: 'new_branch')
|
|
|
|
expect { merge_request.reload.target_branch }.not_to change { merge_request.target_branch }
|
|
end
|
|
|
|
it_behaves_like 'update invalid issuable', MergeRequest
|
|
end
|
|
end
|
|
|
|
describe 'POST merge' do
|
|
let(:base_params) do
|
|
{
|
|
namespace_id: project.namespace,
|
|
project_id: project,
|
|
id: merge_request.iid,
|
|
squash: false,
|
|
format: 'json'
|
|
}
|
|
end
|
|
|
|
context 'when user cannot access' do
|
|
let(:user) { create(:user) }
|
|
|
|
before do
|
|
project.add_reporter(user)
|
|
xhr :post, :merge, base_params
|
|
end
|
|
|
|
it 'returns 404' do
|
|
expect(response).to have_gitlab_http_status(404)
|
|
end
|
|
end
|
|
|
|
context 'when the merge request is not mergeable' do
|
|
before do
|
|
merge_request.update(title: "WIP: #{merge_request.title}")
|
|
|
|
post :merge, base_params
|
|
end
|
|
|
|
it 'returns :failed' do
|
|
expect(json_response).to eq('status' => 'failed')
|
|
end
|
|
end
|
|
|
|
context 'when the sha parameter does not match the source SHA' do
|
|
before do
|
|
post :merge, base_params.merge(sha: 'foo')
|
|
end
|
|
|
|
it 'returns :sha_mismatch' do
|
|
expect(json_response).to eq('status' => 'sha_mismatch')
|
|
end
|
|
end
|
|
|
|
context 'when the sha parameter matches the source SHA' do
|
|
def merge_with_sha(params = {})
|
|
post_params = base_params.merge(sha: merge_request.diff_head_sha).merge(params)
|
|
if Gitlab.rails5?
|
|
post :merge, params: post_params, as: :json
|
|
else
|
|
post :merge, post_params
|
|
end
|
|
end
|
|
|
|
it 'returns :success' do
|
|
merge_with_sha
|
|
|
|
expect(json_response).to eq('status' => 'success')
|
|
end
|
|
|
|
it 'starts the merge immediately with permitted params' do
|
|
expect(MergeWorker).to receive(:perform_async).with(merge_request.id, anything, { 'squash' => false })
|
|
|
|
merge_with_sha
|
|
end
|
|
|
|
context 'when squash is passed as 1' do
|
|
it 'updates the squash attribute on the MR to true' do
|
|
merge_request.update(squash: false)
|
|
merge_with_sha(squash: '1')
|
|
|
|
expect(merge_request.reload.squash).to be_truthy
|
|
end
|
|
end
|
|
|
|
context 'when squash is passed as 0' do
|
|
it 'updates the squash attribute on the MR to false' do
|
|
merge_request.update(squash: true)
|
|
merge_with_sha(squash: '0')
|
|
|
|
expect(merge_request.reload.squash).to be_falsey
|
|
end
|
|
end
|
|
|
|
context 'when the pipeline succeeds is passed' do
|
|
let!(:head_pipeline) do
|
|
create(:ci_empty_pipeline, project: project, sha: merge_request.diff_head_sha, ref: merge_request.source_branch, head_pipeline_of: merge_request)
|
|
end
|
|
|
|
def merge_when_pipeline_succeeds
|
|
post :merge, base_params.merge(sha: merge_request.diff_head_sha, merge_when_pipeline_succeeds: '1')
|
|
end
|
|
|
|
it 'returns :merge_when_pipeline_succeeds' do
|
|
merge_when_pipeline_succeeds
|
|
|
|
expect(json_response).to eq('status' => 'merge_when_pipeline_succeeds')
|
|
end
|
|
|
|
it 'sets the MR to merge when the pipeline succeeds' do
|
|
service = double(:merge_when_pipeline_succeeds_service)
|
|
|
|
expect(MergeRequests::MergeWhenPipelineSucceedsService)
|
|
.to receive(:new).with(project, anything, anything)
|
|
.and_return(service)
|
|
expect(service).to receive(:execute).with(merge_request)
|
|
|
|
merge_when_pipeline_succeeds
|
|
end
|
|
|
|
context 'when project.only_allow_merge_if_pipeline_succeeds? is true' do
|
|
before do
|
|
project.update_column(:only_allow_merge_if_pipeline_succeeds, true)
|
|
end
|
|
|
|
context 'and head pipeline is not the current one' do
|
|
before do
|
|
head_pipeline.update(sha: 'not_current_sha')
|
|
end
|
|
|
|
it 'returns :failed' do
|
|
merge_when_pipeline_succeeds
|
|
|
|
expect(json_response).to eq('status' => 'failed')
|
|
end
|
|
end
|
|
|
|
it 'returns :merge_when_pipeline_succeeds' do
|
|
merge_when_pipeline_succeeds
|
|
|
|
expect(json_response).to eq('status' => 'merge_when_pipeline_succeeds')
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'only_allow_merge_if_all_discussions_are_resolved? setting' do
|
|
let(:merge_request) { create(:merge_request_with_diff_notes, source_project: project, author: user) }
|
|
|
|
context 'when enabled' do
|
|
before do
|
|
project.update_column(:only_allow_merge_if_all_discussions_are_resolved, true)
|
|
end
|
|
|
|
context 'with unresolved discussion' do
|
|
before do
|
|
expect(merge_request).not_to be_discussions_resolved
|
|
end
|
|
|
|
it 'returns :failed' do
|
|
merge_with_sha
|
|
|
|
expect(json_response).to eq('status' => 'failed')
|
|
end
|
|
end
|
|
|
|
context 'with all discussions resolved' do
|
|
before do
|
|
merge_request.discussions.each { |d| d.resolve!(user) }
|
|
expect(merge_request).to be_discussions_resolved
|
|
end
|
|
|
|
it 'returns :success' do
|
|
merge_with_sha
|
|
|
|
expect(json_response).to eq('status' => 'success')
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when disabled' do
|
|
before do
|
|
project.update_column(:only_allow_merge_if_all_discussions_are_resolved, false)
|
|
end
|
|
|
|
context 'with unresolved discussion' do
|
|
before do
|
|
expect(merge_request).not_to be_discussions_resolved
|
|
end
|
|
|
|
it 'returns :success' do
|
|
merge_with_sha
|
|
|
|
expect(json_response).to eq('status' => 'success')
|
|
end
|
|
end
|
|
|
|
context 'with all discussions resolved' do
|
|
before do
|
|
merge_request.discussions.each { |d| d.resolve!(user) }
|
|
expect(merge_request).to be_discussions_resolved
|
|
end
|
|
|
|
it 'returns :success' do
|
|
merge_with_sha
|
|
|
|
expect(json_response).to eq('status' => 'success')
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
describe "DELETE destroy" do
|
|
let(:user) { create(:user) }
|
|
|
|
it "denies access to users unless they're admin or project owner" do
|
|
delete :destroy, namespace_id: project.namespace, project_id: project, id: merge_request.iid
|
|
|
|
expect(response).to have_gitlab_http_status(404)
|
|
end
|
|
|
|
context "when the user is owner" do
|
|
let(:owner) { create(:user) }
|
|
let(:namespace) { create(:namespace, owner: owner) }
|
|
let(:project) { create(:project, :repository, namespace: namespace) }
|
|
|
|
before do
|
|
sign_in owner
|
|
end
|
|
|
|
it "deletes the merge request" do
|
|
delete :destroy, namespace_id: project.namespace, project_id: project, id: merge_request.iid
|
|
|
|
expect(response).to have_gitlab_http_status(302)
|
|
expect(controller).to set_flash[:notice].to(/The merge request was successfully deleted\./)
|
|
end
|
|
|
|
it 'delegates the update of the todos count cache to TodoService' do
|
|
expect_any_instance_of(TodoService).to receive(:destroy_target).with(merge_request).once
|
|
|
|
delete :destroy, namespace_id: project.namespace, project_id: project, id: merge_request.iid
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'GET commits' do
|
|
def go(format: 'html')
|
|
get :commits,
|
|
namespace_id: project.namespace.to_param,
|
|
project_id: project,
|
|
id: merge_request.iid,
|
|
format: format
|
|
end
|
|
|
|
it 'renders the commits template to a string' do
|
|
go format: 'json'
|
|
|
|
expect(response).to render_template('projects/merge_requests/_commits')
|
|
expect(json_response).to have_key('html')
|
|
end
|
|
end
|
|
|
|
describe 'GET pipelines' do
|
|
before do
|
|
create(:ci_pipeline, project: merge_request.source_project,
|
|
ref: merge_request.source_branch,
|
|
sha: merge_request.diff_head_sha)
|
|
|
|
get :pipelines,
|
|
namespace_id: project.namespace.to_param,
|
|
project_id: project,
|
|
id: merge_request.iid,
|
|
format: :json
|
|
end
|
|
|
|
it 'responds with serialized pipelines' do
|
|
expect(json_response['pipelines']).not_to be_empty
|
|
expect(json_response['count']['all']).to eq 1
|
|
end
|
|
end
|
|
|
|
describe 'GET test_reports' do
|
|
subject do
|
|
get :test_reports,
|
|
namespace_id: project.namespace.to_param,
|
|
project_id: project,
|
|
id: merge_request.iid,
|
|
format: :json
|
|
end
|
|
|
|
before do
|
|
allow_any_instance_of(MergeRequest)
|
|
.to receive(:compare_test_reports).and_return(comparison_status)
|
|
end
|
|
|
|
context 'when comparison is being processed' do
|
|
let(:comparison_status) { { status: :parsing } }
|
|
|
|
it 'sends polling interval' do
|
|
expect(Gitlab::PollingInterval).to receive(:set_header)
|
|
|
|
subject
|
|
end
|
|
|
|
it 'returns 204 HTTP status' do
|
|
subject
|
|
|
|
expect(response).to have_gitlab_http_status(:no_content)
|
|
end
|
|
end
|
|
|
|
context 'when comparison is done' do
|
|
let(:comparison_status) { { status: :parsed, data: { summary: 1 } } }
|
|
|
|
it 'does not send polling interval' do
|
|
expect(Gitlab::PollingInterval).not_to receive(:set_header)
|
|
|
|
subject
|
|
end
|
|
|
|
it 'returns 200 HTTP status' do
|
|
subject
|
|
|
|
expect(response).to have_gitlab_http_status(:ok)
|
|
expect(json_response).to eq({ 'summary' => 1 })
|
|
end
|
|
end
|
|
|
|
context 'when user created corrupted test reports' do
|
|
let(:comparison_status) { { status: :error, status_reason: 'Failed to parse test reports' } }
|
|
|
|
it 'does not send polling interval' do
|
|
expect(Gitlab::PollingInterval).not_to receive(:set_header)
|
|
|
|
subject
|
|
end
|
|
|
|
it 'returns 400 HTTP status' do
|
|
subject
|
|
|
|
expect(response).to have_gitlab_http_status(:bad_request)
|
|
expect(json_response).to eq({ 'status_reason' => 'Failed to parse test reports' })
|
|
end
|
|
end
|
|
|
|
context 'when something went wrong on our system' do
|
|
let(:comparison_status) { {} }
|
|
|
|
it 'does not send polling interval' do
|
|
expect(Gitlab::PollingInterval).not_to receive(:set_header)
|
|
|
|
subject
|
|
end
|
|
|
|
it 'returns 500 HTTP status' do
|
|
subject
|
|
|
|
expect(response).to have_gitlab_http_status(:internal_server_error)
|
|
expect(json_response).to eq({ 'status_reason' => 'Unknown error' })
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'POST remove_wip' do
|
|
before do
|
|
merge_request.title = merge_request.wip_title
|
|
merge_request.save
|
|
|
|
xhr :post, :remove_wip,
|
|
namespace_id: merge_request.project.namespace.to_param,
|
|
project_id: merge_request.project,
|
|
id: merge_request.iid,
|
|
format: :json
|
|
end
|
|
|
|
it 'removes the wip status' do
|
|
expect(merge_request.reload.title).to eq(merge_request.wipless_title)
|
|
end
|
|
|
|
it 'renders MergeRequest as JSON' do
|
|
expect(json_response.keys).to include('id', 'iid', 'description')
|
|
end
|
|
end
|
|
|
|
describe 'POST cancel_merge_when_pipeline_succeeds' do
|
|
subject do
|
|
xhr :post, :cancel_merge_when_pipeline_succeeds,
|
|
namespace_id: merge_request.project.namespace.to_param,
|
|
project_id: merge_request.project,
|
|
id: merge_request.iid,
|
|
format: :json
|
|
end
|
|
|
|
it 'calls MergeRequests::MergeWhenPipelineSucceedsService' do
|
|
mwps_service = double
|
|
|
|
allow(MergeRequests::MergeWhenPipelineSucceedsService)
|
|
.to receive(:new)
|
|
.and_return(mwps_service)
|
|
|
|
expect(mwps_service).to receive(:cancel).with(merge_request)
|
|
|
|
subject
|
|
end
|
|
|
|
it { is_expected.to have_gitlab_http_status(:success) }
|
|
|
|
it 'renders MergeRequest as JSON' do
|
|
subject
|
|
|
|
expect(json_response.keys).to include('id', 'iid', 'description')
|
|
end
|
|
end
|
|
|
|
describe 'POST assign_related_issues' do
|
|
let(:issue1) { create(:issue, project: project) }
|
|
let(:issue2) { create(:issue, project: project) }
|
|
|
|
def post_assign_issues
|
|
merge_request.update!(description: "Closes #{issue1.to_reference} and #{issue2.to_reference}",
|
|
author: user,
|
|
source_branch: 'feature',
|
|
target_branch: 'master')
|
|
|
|
post :assign_related_issues,
|
|
namespace_id: project.namespace.to_param,
|
|
project_id: project,
|
|
id: merge_request.iid
|
|
end
|
|
|
|
it 'shows a flash message on success' do
|
|
post_assign_issues
|
|
|
|
expect(flash[:notice]).to eq '2 issues have been assigned to you'
|
|
end
|
|
|
|
it 'correctly pluralizes flash message on success' do
|
|
issue2.assignees = [user]
|
|
|
|
post_assign_issues
|
|
|
|
expect(flash[:notice]).to eq '1 issue has been assigned to you'
|
|
end
|
|
|
|
it 'calls MergeRequests::AssignIssuesService' do
|
|
expect(MergeRequests::AssignIssuesService).to receive(:new)
|
|
.with(project, user, merge_request: merge_request)
|
|
.and_return(double(execute: { count: 1 }))
|
|
|
|
post_assign_issues
|
|
end
|
|
|
|
it 'is skipped when not signed in' do
|
|
project.update!(visibility_level: Gitlab::VisibilityLevel::PUBLIC)
|
|
sign_out(:user)
|
|
|
|
expect(MergeRequests::AssignIssuesService).not_to receive(:new)
|
|
|
|
post_assign_issues
|
|
end
|
|
end
|
|
|
|
describe 'GET ci_environments_status' do
|
|
context 'the environment is from a forked project' do
|
|
let!(:forked) { fork_project(project, user, repository: true) }
|
|
let!(:environment) { create(:environment, project: forked) }
|
|
let!(:deployment) { create(:deployment, environment: environment, sha: forked.commit.id, ref: 'master') }
|
|
let(:admin) { create(:admin) }
|
|
|
|
let(:merge_request) do
|
|
create(:merge_request, source_project: forked, target_project: project)
|
|
end
|
|
|
|
before do
|
|
get :ci_environments_status,
|
|
namespace_id: merge_request.project.namespace.to_param,
|
|
project_id: merge_request.project,
|
|
id: merge_request.iid, format: 'json'
|
|
end
|
|
|
|
it 'links to the environment on that project' do
|
|
expect(json_response.first['url']).to match /#{forked.full_path}/
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'GET pipeline_status.json' do
|
|
context 'when head_pipeline exists' do
|
|
let!(:pipeline) do
|
|
create(:ci_pipeline, project: merge_request.source_project,
|
|
ref: merge_request.source_branch,
|
|
sha: merge_request.diff_head_sha,
|
|
head_pipeline_of: merge_request)
|
|
end
|
|
|
|
let(:status) { pipeline.detailed_status(double('user')) }
|
|
|
|
before do
|
|
get_pipeline_status
|
|
end
|
|
|
|
it 'return a detailed head_pipeline status in json' do
|
|
expect(response).to have_gitlab_http_status(:ok)
|
|
expect(json_response['text']).to eq status.text
|
|
expect(json_response['label']).to eq status.label
|
|
expect(json_response['icon']).to eq status.icon
|
|
expect(json_response['favicon']).to match_asset_path "/assets/ci_favicons/#{status.favicon}.png"
|
|
end
|
|
end
|
|
|
|
context 'when head_pipeline does not exist' do
|
|
before do
|
|
get_pipeline_status
|
|
end
|
|
|
|
it 'return empty' do
|
|
expect(response).to have_gitlab_http_status(:ok)
|
|
expect(json_response).to be_empty
|
|
end
|
|
end
|
|
|
|
def get_pipeline_status
|
|
get :pipeline_status, namespace_id: project.namespace,
|
|
project_id: project,
|
|
id: merge_request.iid,
|
|
format: :json
|
|
end
|
|
end
|
|
|
|
describe 'POST #rebase' do
|
|
let(:viewer) { user }
|
|
|
|
def post_rebase
|
|
post :rebase, namespace_id: project.namespace, project_id: project, id: merge_request
|
|
end
|
|
|
|
def expect_rebase_worker_for(user)
|
|
expect(RebaseWorker).to receive(:perform_async).with(merge_request.id, user.id)
|
|
end
|
|
|
|
context 'successfully' do
|
|
it 'enqeues a RebaseWorker' do
|
|
expect_rebase_worker_for(viewer)
|
|
|
|
post_rebase
|
|
|
|
expect(response.status).to eq(200)
|
|
end
|
|
end
|
|
|
|
context 'with a forked project' do
|
|
let(:fork_project) { create(:project, :repository, forked_from_project: project) }
|
|
let(:fork_owner) { fork_project.owner }
|
|
|
|
before do
|
|
merge_request.update!(source_project: fork_project)
|
|
fork_project.add_reporter(user)
|
|
end
|
|
|
|
context 'user cannot push to source branch' do
|
|
it 'returns 404' do
|
|
expect_rebase_worker_for(viewer).never
|
|
|
|
post_rebase
|
|
|
|
expect(response.status).to eq(404)
|
|
end
|
|
end
|
|
|
|
context 'user can push to source branch' do
|
|
before do
|
|
project.add_reporter(fork_owner)
|
|
|
|
sign_in(fork_owner)
|
|
end
|
|
|
|
it 'returns 200' do
|
|
expect_rebase_worker_for(fork_owner)
|
|
|
|
post_rebase
|
|
|
|
expect(response.status).to eq(200)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'GET edit' do
|
|
it 'responds successfully' do
|
|
get :edit, namespace_id: project.namespace, project_id: project, id: merge_request
|
|
|
|
expect(response).to have_gitlab_http_status(:success)
|
|
end
|
|
|
|
it 'assigns the noteable to make sure autocompletes work' do
|
|
get :edit, namespace_id: project.namespace, project_id: project, id: merge_request
|
|
|
|
expect(assigns(:noteable)).not_to be_nil
|
|
end
|
|
end
|
|
end
|