diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 12:07:43 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 12:07:43 +0000 |
commit | 39fa7d1eeb2dba52f0601128f3ac91f57d19866e (patch) | |
tree | da042d34ff762dd1957e51666a34202295a081b9 /spec/services/merge_requests | |
parent | 6ac4a6713ed3196af899011f7e18658e16ebaac0 (diff) | |
download | gitlab-ce-39fa7d1eeb2dba52f0601128f3ac91f57d19866e.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/merge_requests')
-rw-r--r-- | spec/services/merge_requests/after_create_service_spec.rb | 14 | ||||
-rw-r--r-- | spec/services/merge_requests/create_service_spec.rb | 16 |
2 files changed, 0 insertions, 30 deletions
diff --git a/spec/services/merge_requests/after_create_service_spec.rb b/spec/services/merge_requests/after_create_service_spec.rb index 974f72fa376..4aefe5f7dae 100644 --- a/spec/services/merge_requests/after_create_service_spec.rb +++ b/spec/services/merge_requests/after_create_service_spec.rb @@ -53,19 +53,5 @@ describe MergeRequests::AfterCreateService do after_create_service.execute(merge_request) end - - # https://gitlab.com/gitlab-org/gitlab/issues/208813 - context 'when the create_merge_request_pipelines_in_sidekiq flag is disabled' do - before do - stub_feature_flags(create_merge_request_pipelines_in_sidekiq: false) - end - - it 'does not create a pipeline or update the HEAD pipeline' do - expect(after_create_service).not_to receive(:create_pipeline_for) - expect(merge_request).not_to receive(:update_head_pipeline) - - after_create_service.execute(merge_request) - end - end end end diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb index 2514fda5053..dc34546a599 100644 --- a/spec/services/merge_requests/create_service_spec.rb +++ b/spec/services/merge_requests/create_service_spec.rb @@ -129,22 +129,6 @@ describe MergeRequests::CreateService, :clean_gitlab_redis_shared_state do end end - # https://gitlab.com/gitlab-org/gitlab/issues/208813 - context 'when the create_merge_request_pipelines_in_sidekiq flag is disabled' do - before do - stub_feature_flags(create_merge_request_pipelines_in_sidekiq: false) - end - - it 'creates a pipeline and updates the HEAD pipeline' do - expect(service).to receive(:create_pipeline_for) - expect_next_instance_of(MergeRequest) do |merge_request| - expect(merge_request).to receive(:update_head_pipeline) - end - - service.execute - end - end - context 'when head pipelines already exist for merge request source branch', :sidekiq_inline do let(:shas) { project.repository.commits(opts[:source_branch], limit: 2).map(&:id) } let!(:pipeline_1) { create(:ci_pipeline, project: project, ref: opts[:source_branch], project_id: project.id, sha: shas[1]) } |