mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-09 20:56:08 +10:00
Improve Ci config loader by changing method signature
This commit is contained in:
@@ -5,7 +5,7 @@ module Gitlab
|
||||
|
||||
def initialize(config)
|
||||
loader = Loader.new(config)
|
||||
@config = loader.load
|
||||
@config = loader.load!
|
||||
end
|
||||
|
||||
def to_hash
|
||||
|
||||
@@ -12,7 +12,7 @@ module Gitlab
|
||||
@config.is_a?(Hash)
|
||||
end
|
||||
|
||||
def load
|
||||
def load!
|
||||
unless valid?
|
||||
raise FormatError, 'Invalid configuration format'
|
||||
end
|
||||
|
||||
@@ -12,9 +12,9 @@ describe Gitlab::Ci::Config::Loader do
|
||||
end
|
||||
end
|
||||
|
||||
describe '#load' do
|
||||
describe '#load!' do
|
||||
it 'returns a valid hash' do
|
||||
expect(loader.load).to eq(image: 'ruby:2.2')
|
||||
expect(loader.load!).to eq(image: 'ruby:2.2')
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -28,9 +28,9 @@ describe Gitlab::Ci::Config::Loader do
|
||||
end
|
||||
end
|
||||
|
||||
describe '#load' do
|
||||
describe '#load!' do
|
||||
it 'raises error' do
|
||||
expect { loader.load }.to raise_error(
|
||||
expect { loader.load! }.to raise_error(
|
||||
Gitlab::Ci::Config::Loader::FormatError,
|
||||
'Invalid configuration format'
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user