Improve after review

This commit is contained in:
Kamil Trzcinski 2016-06-10 21:25:48 +02:00 committed by Phil Hughes
parent 93080b65cd
commit d23b91b0d9
3 changed files with 5 additions and 4 deletions

View file

@ -670,7 +670,7 @@ failure.
**Example configurations**
To upload artifacts only when build fails
To upload artifacts only when build fails.
```yaml
job:

View file

@ -208,7 +208,7 @@ module Ci
raise ValidationError, "#{name} job: allow_failure parameter should be an boolean"
end
if job[:when] && !job[:when].in?(%w(on_success on_failure always))
if job[:when] && !job[:when].in?(%w[on_success on_failure always])
raise ValidationError, "#{name} job: when parameter should be on_success, on_failure or always"
end
end
@ -279,7 +279,7 @@ module Ci
raise ValidationError, "#{name} job: artifacts:paths parameter should be an array of strings"
end
if job[:artifacts][:when] && !job[:artifacts][:when].in?(%w(on_success on_failure always))
if job[:artifacts][:when] && !job[:artifacts][:when].in?(%w[on_success on_failure always])
raise ValidationError, "#{name} job: artifacts:when parameter should be on_success, on_failure or always"
end

View file

@ -608,7 +608,7 @@ module Ci
})
end
%w(on_success on_failure always).each do |when_state|
%w[on_success on_failure always].each do |when_state|
it "returns artifacts for when #{when_state} defined" do
config = YAML.dump({
rspec: {
@ -618,6 +618,7 @@ module Ci
})
config_processor = GitlabCiYamlProcessor.new(config, path)
builds = config_processor.builds_for_stage_and_ref("test", "master")
expect(builds.size).to eq(1)
expect(builds.first[:options][:artifacts][:when]).to eq(when_state)