diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-04-02 12:03:21 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-04-02 12:03:21 +0000 |
commit | 2179a9839120bca96127b49e2460ca4c1a509921 (patch) | |
tree | feb62c2d41a4707fc505872a8c62302546770223 /spec/models | |
parent | f802aef98386161f2ddefd1e6fd76edb3ccf6cf4 (diff) | |
parent | a04e1d5e32f7ae1740ba8b9daaf3f71a5048126c (diff) | |
download | gitlab-ce-2179a9839120bca96127b49e2460ca4c1a509921.tar.gz |
Merge branch 'expose-mr-pipeline-parameters-for-merge-widget-ce' into 'master'
Backport: Expose merge request pipeline parameters for MR widget
See merge request gitlab-org/gitlab-ce!26826
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/ci/pipeline_spec.rb | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index e76cf376ed1..83b0f172f03 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -322,48 +322,6 @@ describe Ci::Pipeline, :mailer do end end - describe '.mergeable_merge_request_pipelines' do - subject { described_class.mergeable_merge_request_pipelines(merge_request) } - - let!(:pipeline) do - create(:ci_pipeline, source: :merge_request_event, merge_request: merge_request, target_sha: target_sha) - end - - let(:merge_request) { create(:merge_request) } - let(:target_sha) { merge_request.target_branch_sha } - - it 'returns mergeable merge pipelines' do - is_expected.to eq([pipeline]) - end - - context 'when target sha does not point the head of the target branch' do - let(:target_sha) { merge_request.diff_head_sha } - - it 'returns empty array' do - is_expected.to be_empty - end - end - end - - describe '#mergeable_merge_request_pipeline?' do - subject { pipeline.mergeable_merge_request_pipeline? } - - let!(:pipeline) do - create(:ci_pipeline, source: :merge_request_event, merge_request: merge_request, target_sha: target_sha) - end - - let(:merge_request) { create(:merge_request) } - let(:target_sha) { merge_request.target_branch_sha } - - it { is_expected.to be_truthy } - - context 'when target sha does not point the head of the target branch' do - let(:target_sha) { merge_request.diff_head_sha } - - it { is_expected.to be_falsy } - end - end - describe '#merge_request_ref?' do subject { pipeline.merge_request_ref? } |