Separate cron_valid? and cron_time_zone_valid?

2 files changed, 10 insertions, 7 deletions

diff --git a/app/validators/cron_time_zone_validator.rb b/app/validators/cron_time_zone_validator.rb
new file mode 100644
index 00000000000..9d4bbe1d458
--- /dev/null
+++ b/app/validators/cron_time_zone_validator.rb
@@ -0,0 +1,9 @@
+# CronTimeZoneValidator
+#
+# Custom validator for CronTimeZone.
+class CronTimeZoneValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    cron_parser = Gitlab::Ci::CronParser.new(record.cron, record.cron_time_zone)
+    record.errors.add(attribute, " is invalid syntax") unless cron_parser.cron_time_zone_valid?
+  end
+end
diff --git a/app/validators/cron_validator.rb b/app/validators/cron_validator.rb
index 31eaa4147a5..cc07011d56b 100644
--- a/app/validators/cron_validator.rb
+++ b/app/validators/cron_validator.rb
@@ -4,12 +4,6 @@
 class CronValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     cron_parser = Gitlab::Ci::CronParser.new(record.cron, record.cron_time_zone)
-    is_valid_cron, is_valid_cron_time_zone = cron_parser.validation
-
-    if !is_valid_cron
-      record.errors.add(:cron, " is invalid syntax")
-    elsif !is_valid_cron_time_zone
-      record.errors.add(:cron_time_zone, " is invalid timezone")
-    end
+    record.errors.add(attribute, " is invalid syntax") unless cron_parser.cron_valid?
   end
 end