Commit 680afb3d authored by Grzegorz Bizon's avatar Grzegorz Bizon

Do not raise error when checking pipeline reference

Return from the `Ci::Pipeline#ref_exists?` in case when there is no
repository present.

This also fixes pipeline page feature specs by changing pipeline
reference instead of stubbing `ref_exist?` method.
parent 5f412e3a
No related merge requests found
......@@ -270,6 +270,8 @@ module Ci
def ref_exists?
project.repository.ref_exists?(git_ref)
rescue Gitlab::Git::Repository::NoRepository
false
end
##
......
......@@ -241,9 +241,12 @@ describe 'Pipeline', :js do
end
end
context 'with deleted branch' do
before do
allow(pipeline).to receive(:ref_exists?).and_return(false)
context 'when pipeline ref does not exist in repository anymore' do
let(:pipeline) do
create(:ci_empty_pipeline, project: project,
ref: 'non-existent',
sha: project.commit.id,
user: user)
end
it 'does not render link to the pipeline ref' do
......
......@@ -780,24 +780,36 @@ describe Ci::Pipeline, :mailer do
end
describe 'ref_exists?' do
using RSpec::Parameterized::TableSyntax
context 'when repository exists' do
using RSpec::Parameterized::TableSyntax
let(:project) { create(:project, :repository) }
let(:project) { create(:project, :repository) }
where(:tag, :ref, :result) do
false | 'master' | true
false | 'non-existent-branch' | false
true | 'v1.1.0' | true
true | 'non-existent-tag' | false
where(:tag, :ref, :result) do
false | 'master' | true
false | 'non-existent-branch' | false
true | 'v1.1.0' | true
true | 'non-existent-tag' | false
end
with_them do
let(:pipeline) do
create(:ci_empty_pipeline, project: project, tag: tag, ref: ref)
end
it "correctly detects ref" do
expect(pipeline.ref_exists?).to be result
end
end
end
with_them do
context 'when repository does not exist' do
let(:pipeline) do
create(:ci_empty_pipeline, project: project, tag: tag, ref: ref)
create(:ci_empty_pipeline, project: project, ref: 'master')
end
it "correctly detects ref" do
expect(pipeline.ref_exists?).to be result
it 'always returns false' do
expect(pipeline.ref_exists?).to eq false
end
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment