summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-10 21:25:48 +0200
committerPhil Hughes <me@iamphill.com>2016-06-13 11:08:15 +0100
commitd23b91b0d9b8db16801872c49a1fb1d3be3a7144 (patch)
treeb7faeddf096365649b893fcd980f9f63586f334e
parent93080b65cd42ca90ccab8c9ecb2b68c79aafa193 (diff)
downloadgitlab-ce-d23b91b0d9b8db16801872c49a1fb1d3be3a7144.tar.gz
Improve after review
-rw-r--r--doc/ci/yaml/README.md2
-rw-r--r--lib/ci/gitlab_ci_yaml_processor.rb4
-rw-r--r--spec/lib/ci/gitlab_ci_yaml_processor_spec.rb3
3 files changed, 5 insertions, 4 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 39fad549a04..0707555e393 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -670,7 +670,7 @@ failure.
**Example configurations**
-To upload artifacts only when build fails
+To upload artifacts only when build fails.
```yaml
job:
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 88fa079f30d..76d84433cbe 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -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
diff --git a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
index 00a04683e50..ad693dd05f5 100644
--- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
@@ -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)