diff options
| author | Filip Krakowski <Filip.Krakowski@Uni-Duesseldorf.de> | 2017-06-02 19:58:20 +0200 |
|---|---|---|
| committer | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-06-08 00:34:58 +0900 |
| commit | 1dd054e1788fa7b308a9088f3bb35808a027e76d (patch) | |
| tree | 1277a54d5827ec7ba3d28c3220fdd4b970ea4bd1 | |
| parent | ecb54cddd164fbf83288d7903c4692df462bae5e (diff) | |
| download | gitlab-ce-1dd054e1788fa7b308a9088f3bb35808a027e76d.tar.gz | |
Fix static-analysis offenses
| -rw-r--r-- | lib/ci/gitlab_ci_yaml_processor.rb | 2 | ||||
| -rw-r--r-- | spec/lib/ci/gitlab_ci_yaml_processor_spec.rb | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb index 0b362921b06..d236c42929a 100644 --- a/lib/ci/gitlab_ci_yaml_processor.rb +++ b/lib/ci/gitlab_ci_yaml_processor.rb @@ -229,7 +229,7 @@ module Ci end def source_to_pattern(source) - return source if ['api', 'external', 'web'].include? source + return source if %w(api external web).include? source return source.pluralize end end diff --git a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb index 79ed1366336..fef2d992aaa 100644 --- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb +++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb @@ -394,12 +394,12 @@ module Ci end it "does not return builds if except has special keywords specified and source matches" do - possibilities = [{keyword: 'pushes', source: 'push'}, - {keyword: 'web', source: 'web'}, - {keyword: 'triggers', source: 'trigger'}, - {keyword: 'schedules', source: 'schedule'}, - {keyword: 'api', source: 'api'}, - {keyword: 'external', source: 'external'}] + possibilities = [{ keyword: 'pushes', source: 'push' }, + { keyword: 'web', source: 'web' }, + { keyword: 'triggers', source: 'trigger' }, + { keyword: 'schedules', source: 'schedule' }, + { keyword: 'api', source: 'api' }, + { keyword: 'external', source: 'external' }] possibilities.each do |possibility| config = YAML.dump({ |