diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-01 09:10:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-01 09:10:47 +0300 |
commit | 21543f57d625a70c3884d1915fa14ad340d01edc (patch) | |
tree | 4ef599f32345507febcd563a5a7a0f2bb06dcd14 /spec/models | |
parent | 46c89ffafef24d59ac7ccd56e30cf2b5c7bf5d77 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/ci/pipeline_spec.rb | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index a4a10aaeb31..a487ba86bbf 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -373,8 +373,8 @@ RSpec.describe Ci::Pipeline, :mailer, factory_default: :keep do end end - describe '#merge_request_pipeline?' do - subject { pipeline.merge_request_pipeline? } + describe '#merged_result_pipeline?' do + subject { pipeline.merged_result_pipeline? } let!(:pipeline) do create(:ci_pipeline, source: :merge_request_event, merge_request: merge_request, target_sha: target_sha) @@ -422,24 +422,6 @@ RSpec.describe Ci::Pipeline, :mailer, factory_default: :keep do end end - describe '#for_merged_result?' do - subject { pipeline.for_merged_result? } - - let(:pipeline) { merge_request.all_pipelines.last } - - context 'when pipeline is merge request pipeline' do - let(:merge_request) { create(:merge_request, :with_merge_request_pipeline) } - - it { is_expected.to be_truthy } - end - - context 'when pipeline is detached merge request pipeline' do - let(:merge_request) { create(:merge_request, :with_detached_merge_request_pipeline) } - - it { is_expected.to be_falsey } - end - end - describe '#legacy_detached_merge_request_pipeline?' do subject { pipeline.legacy_detached_merge_request_pipeline? } |