Add validation to Ci::TriggerSchedule (Halfway)

1 files changed, 7 insertions, 5 deletions

diff --git a/lib/ci/cron_parser.rb b/lib/ci/cron_parser.rb
index 24c4dd676dc..b0ffb48dabc 100644
--- a/lib/ci/cron_parser.rb
+++ b/lib/ci/cron_parser.rb
@@ -6,20 +6,22 @@ module Ci
     end
 
     def next_time_from_now
-      cronLine = try_parse_cron
+      cronLine = try_parse_cron(@cron, @cron_time_zone)
       return nil unless cronLine.present?
       cronLine.next_time
     end
 
-    def valid_syntax?
-      try_parse_cron.present? ? true : false
+    def validation
+      is_valid_cron = try_parse_cron(@cron, 'Europe/Istanbul').present?
+      is_valid_cron_time_zone = try_parse_cron('* * * * *', @cron_time_zone).present?
+      return is_valid_cron, is_valid_cron_time_zone
     end
 
     private
 
-    def try_parse_cron
+    def try_parse_cron(cron, cron_time_zone)
       begin
-        Rufus::Scheduler.parse("#{@cron} #{@cron_time_zone}")
+        Rufus::Scheduler.parse("#{cron} #{cron_time_zone}")
       rescue
         nil
       end