2016-08-12 10:23:00 -04:00
|
|
|
require 'spec_helper'
|
|
|
|
|
2017-06-29 00:13:10 -04:00
|
|
|
feature 'Pipelines for Merge Requests', js: true do
|
2017-08-04 05:01:59 -04:00
|
|
|
describe 'pipeline tab' do
|
|
|
|
given(:user) { create(:user) }
|
|
|
|
given(:merge_request) { create(:merge_request) }
|
|
|
|
given(:project) { merge_request.target_project }
|
2016-08-12 10:23:00 -04:00
|
|
|
|
2017-08-04 05:01:59 -04:00
|
|
|
before do
|
|
|
|
project.team << [user, :master]
|
|
|
|
sign_in user
|
2016-08-12 10:23:00 -04:00
|
|
|
end
|
|
|
|
|
2017-08-04 05:01:59 -04:00
|
|
|
context 'with pipelines' do
|
|
|
|
let!(:pipeline) do
|
|
|
|
create(:ci_empty_pipeline,
|
|
|
|
project: merge_request.source_project,
|
|
|
|
ref: merge_request.source_branch,
|
|
|
|
sha: merge_request.diff_head_sha)
|
|
|
|
end
|
|
|
|
|
|
|
|
before do
|
|
|
|
visit project_merge_request_path(project, merge_request)
|
|
|
|
end
|
|
|
|
|
|
|
|
scenario 'user visits merge request pipelines tab' do
|
|
|
|
page.within('.merge-request-tabs') do
|
|
|
|
click_link('Pipelines')
|
|
|
|
end
|
|
|
|
wait_for_requests
|
|
|
|
|
2017-08-04 07:18:05 -04:00
|
|
|
expect(page).to have_selector('.stage-cell')
|
2017-08-04 05:01:59 -04:00
|
|
|
end
|
2016-08-12 10:23:00 -04:00
|
|
|
end
|
|
|
|
|
2017-08-04 05:01:59 -04:00
|
|
|
context 'without pipelines' do
|
|
|
|
before do
|
|
|
|
visit project_merge_request_path(project, merge_request)
|
2016-08-12 10:23:00 -04:00
|
|
|
end
|
|
|
|
|
2017-08-04 05:01:59 -04:00
|
|
|
scenario 'user visits merge request page' do
|
|
|
|
page.within('.merge-request-tabs') do
|
|
|
|
expect(page).to have_no_link('Pipelines')
|
|
|
|
end
|
|
|
|
end
|
2016-08-12 10:23:00 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-08-04 05:01:59 -04:00
|
|
|
describe 'race condition' do
|
|
|
|
given(:project) { create(:project, :repository) }
|
|
|
|
given(:user) { create(:user) }
|
|
|
|
given(:build_push_data) { { ref: 'feature', checkout_sha: TestEnv::BRANCH_SHA['feature'] } }
|
|
|
|
|
|
|
|
given(:merge_request_params) do
|
2017-08-04 08:44:19 -04:00
|
|
|
{ "source_branch" => "feature", "source_project_id" => project.id,
|
|
|
|
"target_branch" => "master", "target_project_id" => project.id, "title" => "A" }
|
2017-08-04 05:01:59 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
background do
|
|
|
|
project.add_master(user)
|
|
|
|
sign_in user
|
2016-08-12 10:23:00 -04:00
|
|
|
end
|
|
|
|
|
2017-08-04 05:01:59 -04:00
|
|
|
context 'when pipeline and merge request were created simultaneously' do
|
|
|
|
background do
|
|
|
|
stub_ci_pipeline_to_return_yaml_file
|
|
|
|
|
|
|
|
threads = []
|
2017-08-04 07:18:05 -04:00
|
|
|
|
2017-08-04 05:01:59 -04:00
|
|
|
threads << Thread.new do
|
|
|
|
@merge_request = MergeRequests::CreateService.new(project, user, merge_request_params).execute
|
|
|
|
end
|
|
|
|
|
|
|
|
threads << Thread.new do
|
|
|
|
@pipeline = Ci::CreatePipelineService.new(project, user, build_push_data).execute(:push)
|
|
|
|
end
|
|
|
|
|
|
|
|
threads.each { |thr| thr.join }
|
|
|
|
end
|
|
|
|
|
|
|
|
scenario 'user sees pipeline in merge request widget' do
|
|
|
|
visit project_merge_request_path(project, @merge_request)
|
2017-08-04 07:18:05 -04:00
|
|
|
|
2017-08-04 05:01:59 -04:00
|
|
|
expect(page.find(".ci-widget")).to have_content(TestEnv::BRANCH_SHA['feature'])
|
|
|
|
expect(page.find(".ci-widget")).to have_content("##{@pipeline.id}")
|
2016-08-12 10:23:00 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|