Move runner validator to separate private method

This commit is contained in:
Grzegorz Bizon
2016-05-19 22:01:53 +02:00
parent 8ab4a67ca6
commit f6dd8a5257
+10 -6
View File
@@ -26,12 +26,7 @@ module Ci
.where("ci_runner_projects.gl_project_id = :project_id OR ci_runners.is_shared = true", project_id: project_id)
end
validate do |runner|
unless runner.has_tags? || runner.run_untagged?
errors.add(:tags_list,
'can not be empty when runner is not allowed to pick untagged jobs')
end
end
validate :verify_tags_constraints
acts_as_taggable
@@ -107,5 +102,14 @@ module Ci
def has_tags?
tag_list.any?
end
private
def verify_tags_constraints
unless has_tags? || run_untagged?
errors.add(:tags_list,
'can not be empty when runner is not allowed to pick untagged jobs')
end
end
end
end