Merge branch 'rc/backport-ee-fix' into 'master'
Backport a spec fix done in EE (5dbecb8e) to CE See merge request gitlab-org/gitlab-ce!15842
This commit is contained in:
commit
51172fdf81
1 changed files with 8 additions and 18 deletions
|
@ -132,11 +132,9 @@ describe Ci::Build do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#artifacts?' do
|
describe '#artifacts?' do
|
||||||
context 'when new artifacts are used' do
|
|
||||||
let(:build) { create(:ci_build, :artifacts) }
|
|
||||||
|
|
||||||
subject { build.artifacts? }
|
subject { build.artifacts? }
|
||||||
|
|
||||||
|
context 'when new artifacts are used' do
|
||||||
context 'artifacts archive does not exist' do
|
context 'artifacts archive does not exist' do
|
||||||
let(:build) { create(:ci_build) }
|
let(:build) { create(:ci_build) }
|
||||||
|
|
||||||
|
@ -144,25 +142,19 @@ describe Ci::Build do
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'artifacts archive exists' do
|
context 'artifacts archive exists' do
|
||||||
|
let(:build) { create(:ci_build, :artifacts) }
|
||||||
|
|
||||||
it { is_expected.to be_truthy }
|
it { is_expected.to be_truthy }
|
||||||
|
|
||||||
context 'is expired' do
|
context 'is expired' do
|
||||||
let!(:build) { create(:ci_build, :artifacts, :expired) }
|
let(:build) { create(:ci_build, :artifacts, :expired) }
|
||||||
|
|
||||||
it { is_expected.to be_falsy }
|
it { is_expected.to be_falsy }
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'is not expired' do
|
|
||||||
it { is_expected.to be_truthy }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when legacy artifacts are used' do
|
context 'when legacy artifacts are used' do
|
||||||
let(:build) { create(:ci_build, :legacy_artifacts) }
|
|
||||||
|
|
||||||
subject { build.artifacts? }
|
|
||||||
|
|
||||||
context 'artifacts archive does not exist' do
|
context 'artifacts archive does not exist' do
|
||||||
let(:build) { create(:ci_build) }
|
let(:build) { create(:ci_build) }
|
||||||
|
|
||||||
|
@ -170,17 +162,15 @@ describe Ci::Build do
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'artifacts archive exists' do
|
context 'artifacts archive exists' do
|
||||||
|
let(:build) { create(:ci_build, :legacy_artifacts) }
|
||||||
|
|
||||||
it { is_expected.to be_truthy }
|
it { is_expected.to be_truthy }
|
||||||
|
|
||||||
context 'is expired' do
|
context 'is expired' do
|
||||||
let!(:build) { create(:ci_build, :legacy_artifacts, :expired) }
|
let(:build) { create(:ci_build, :legacy_artifacts, :expired) }
|
||||||
|
|
||||||
it { is_expected.to be_falsy }
|
it { is_expected.to be_falsy }
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'is not expired' do
|
|
||||||
it { is_expected.to be_truthy }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue