| ... | ... | @@ -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? }
|
|
|
|
|
| ... | ... | |
| ... | ... | |