Remove coverage entry from global CI/CD options
This commit is contained in:
parent
8a333d4505
commit
149f67cc2e
3 changed files with 15 additions and 27 deletions
|
@ -33,11 +33,8 @@ module Gitlab
|
|||
entry :cache, Entry::Cache,
|
||||
description: 'Configure caching between build jobs.'
|
||||
|
||||
entry :coverage, Entry::Coverage,
|
||||
description: 'Coverage configuration for this pipeline.'
|
||||
|
||||
helpers :before_script, :image, :services, :after_script,
|
||||
:variables, :stages, :types, :cache, :coverage, :jobs
|
||||
:variables, :stages, :types, :cache, :jobs
|
||||
|
||||
def compose!(_deps = nil)
|
||||
super(self) do
|
||||
|
|
|
@ -5,27 +5,18 @@ module Ci
|
|||
let(:path) { 'path' }
|
||||
|
||||
describe '#build_attributes' do
|
||||
context 'Coverage entry' do
|
||||
describe 'coverage entry' do
|
||||
subject { described_class.new(config, path).build_attributes(:rspec) }
|
||||
|
||||
let(:config_base) { { rspec: { script: "rspec" } } }
|
||||
let(:config) { YAML.dump(config_base) }
|
||||
|
||||
context 'when config has coverage set at the global scope' do
|
||||
before do
|
||||
config_base.update(coverage: '/\(\d+\.\d+\) covered/')
|
||||
describe 'code coverage regexp' do
|
||||
let(:config) do
|
||||
YAML.dump(rspec: { script: 'rspec',
|
||||
coverage: '/Code coverage: \d+\.\d+/'})
|
||||
end
|
||||
|
||||
context "and 'rspec' job doesn't have coverage set" do
|
||||
it { is_expected.to include(coverage_regex: '\(\d+\.\d+\) covered') }
|
||||
end
|
||||
|
||||
context "but 'rspec' job also has coverage set" do
|
||||
before do
|
||||
config_base[:rspec][:coverage] = '/Code coverage: \d+\.\d+/'
|
||||
end
|
||||
|
||||
it { is_expected.to include(coverage_regex: 'Code coverage: \d+\.\d+') }
|
||||
it 'includes coverage regexp in build attributes' do
|
||||
expect(subject)
|
||||
.to include(coverage_regex: 'Code coverage: \d+\.\d+')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -10,10 +10,10 @@ describe Gitlab::Ci::Config::Entry::Global do
|
|||
|
||||
context 'when filtering all the entry/node names' do
|
||||
it 'contains the expected node names' do
|
||||
node_names = described_class.nodes.keys
|
||||
expect(node_names).to match_array(%i[before_script image services
|
||||
after_script variables stages
|
||||
types cache coverage])
|
||||
expect(described_class.nodes.keys)
|
||||
.to match_array(%i[before_script image services
|
||||
after_script variables stages
|
||||
types cache])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -40,7 +40,7 @@ describe Gitlab::Ci::Config::Entry::Global do
|
|||
end
|
||||
|
||||
it 'creates node object for each entry' do
|
||||
expect(global.descendants.count).to eq 9
|
||||
expect(global.descendants.count).to eq 8
|
||||
end
|
||||
|
||||
it 'creates node object using valid class' do
|
||||
|
@ -181,7 +181,7 @@ describe Gitlab::Ci::Config::Entry::Global do
|
|||
|
||||
describe '#nodes' do
|
||||
it 'instantizes all nodes' do
|
||||
expect(global.descendants.count).to eq 9
|
||||
expect(global.descendants.count).to eq 8
|
||||
end
|
||||
|
||||
it 'contains unspecified nodes' do
|
||||
|
|
Loading…
Reference in a new issue