Merge branch 'ce-fj-11886-fix-port-validation' into 'master'
Fix port validations in .gitlab-webide.yml See merge request gitlab-org/gitlab-ce!29016
This commit is contained in:
commit
6d3ab5d8f6
|
@ -24,7 +24,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
entry :ports, Entry::Ports,
|
||||
description: 'Ports used expose the image'
|
||||
description: 'Ports used to expose the image'
|
||||
|
||||
attributes :ports
|
||||
|
||||
|
|
|
@ -24,6 +24,9 @@ module Gitlab
|
|||
validates :alias, type: String, presence: true, unless: ->(record) { record.ports.blank? }
|
||||
end
|
||||
|
||||
entry :ports, Entry::Ports,
|
||||
description: 'Ports used to expose the service'
|
||||
|
||||
def alias
|
||||
value[:alias]
|
||||
end
|
||||
|
|
|
@ -112,6 +112,16 @@ describe Gitlab::Ci::Config::Entry::Service do
|
|||
it 'is valid' do
|
||||
expect(entry).to be_valid
|
||||
end
|
||||
|
||||
context 'when unknown port keys detected' do
|
||||
let(:ports) { [{ number: 80, invalid_key: 'foo' }] }
|
||||
|
||||
it 'is not valid' do
|
||||
expect(entry).not_to be_valid
|
||||
expect(entry.errors.first)
|
||||
.to match /port config contains unknown keys: invalid_key/
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '#ports' do
|
||||
|
|
Loading…
Reference in New Issue