diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 15:06:00 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 15:06:00 +0300 |
commit | b570d73ecd31e2ca9cf8c2f1adb056edf2869477 (patch) | |
tree | 0b8aa67eab6da552d8499f1fdcf9a7495dcf1379 /spec/services/ci | |
parent | 34b3567c97ecc0f317adae04e10e4d7d8c8830db (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/ci')
-rw-r--r-- | spec/services/ci/process_pipeline_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/services/ci/retry_pipeline_service_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/ci/process_pipeline_service_spec.rb b/spec/services/ci/process_pipeline_service_spec.rb index 991f8cdfac5..a15a0afc526 100644 --- a/spec/services/ci/process_pipeline_service_spec.rb +++ b/spec/services/ci/process_pipeline_service_spec.rb @@ -845,7 +845,7 @@ describe Ci::ProcessPipelineService, '#execute' do end def process_pipeline - described_class.new(pipeline.project, user).execute(pipeline) + described_class.new(pipeline).execute end def all_builds diff --git a/spec/services/ci/retry_pipeline_service_spec.rb b/spec/services/ci/retry_pipeline_service_spec.rb index e42de3cd48f..3cab3158cce 100644 --- a/spec/services/ci/retry_pipeline_service_spec.rb +++ b/spec/services/ci/retry_pipeline_service_spec.rb @@ -223,7 +223,7 @@ describe Ci::RetryPipelineService, '#execute' do end it 'reprocesses the pipeline' do - expect(pipeline).to receive(:process!) + expect_any_instance_of(Ci::ProcessPipelineService).to receive(:execute) service.execute(pipeline) end |