Skip to content
Snippets Groups Projects
Commit 5ef104df authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files

Improve Ci config loader by changing method signature

parent fa097c67
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -5,7 +5,7 @@ module Gitlab
 
def initialize(config)
loader = Loader.new(config)
@config = loader.load
@config = loader.load!
end
 
def to_hash
Loading
Loading
Loading
Loading
@@ -12,7 +12,7 @@ module Gitlab
@config.is_a?(Hash)
end
 
def load
def load!
unless valid?
raise FormatError, 'Invalid configuration format'
end
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
@@ -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'
)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment