Improve Ci config loader by changing method signature

This commit is contained in:
Grzegorz Bizon
2016-06-07 12:53:46 +02:00
parent fa097c678c
commit 5ef104df59
3 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -5,7 +5,7 @@ module Gitlab
def initialize(config)
loader = Loader.new(config)
@config = loader.load
@config = loader.load!
end
def to_hash
+1 -1
View File
@@ -12,7 +12,7 @@ module Gitlab
@config.is_a?(Hash)
end
def load
def load!
unless valid?
raise FormatError, 'Invalid configuration format'
end
+4 -4
View File
@@ -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'
)