Allow remaining time of scheduled jobs to overflow one day

4 files changed, 48 insertions, 16 deletions

diff --git a/app/helpers/time_helper.rb b/app/helpers/time_helper.rb
index 94044d7b85e..737ec33b2dd 100644
--- a/app/helpers/time_helper.rb
+++ b/app/helpers/time_helper.rb
@@ -21,9 +21,21 @@ module TimeHelper
     "#{from.to_s(:short)} - #{to.to_s(:short)}"
   end
 
-  def duration_in_numbers(duration)
-    time_format = duration < 1.hour ? "%M:%S" : "%H:%M:%S"
+  def duration_in_numbers(duration_in_seconds, allow_overflow = false)
+    if allow_overflow
+      seconds = duration_in_seconds % 1.minute
+      minutes = (duration_in_seconds / 1.minute) % (1.hour / 1.minute)
+      hours = duration_in_seconds / 1.hour
 
-    Time.at(duration).utc.strftime(time_format)
+      if hours == 0
+        "%02d:%02d" % [minutes, seconds]
+      else
+        "%02d:%02d:%02d" % [hours, minutes, seconds]
+      end
+    else
+      time_format = duration_in_seconds < 1.hour ? "%M:%S" : "%H:%M:%S"
+
+      Time.at(duration_in_seconds).utc.strftime(time_format)
+    end
   end
 end
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index c706703ae6f..0a9a36e089a 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -106,7 +106,7 @@
             .btn.btn-default.has-tooltip{ disabled: true,
               title: job.scheduled_at }
               = sprite_icon('planning')
-              = duration_in_numbers(job.execute_in)
+              = duration_in_numbers(job.execute_in, true)
             .btn.btn-default.btn-build.has-tooltip{ title: s_('DelayedJobs|Start now') }
               = sprite_icon('play')
             .btn.btn-default.btn-build.has-tooltip{ title: s_('DelayedJobs|Unschedule') }
diff --git a/lib/gitlab/ci/status/build/scheduled.rb b/lib/gitlab/ci/status/build/scheduled.rb
index 493c71718a2..eebb3f761c5 100644
--- a/lib/gitlab/ci/status/build/scheduled.rb
+++ b/lib/gitlab/ci/status/build/scheduled.rb
@@ -25,9 +25,11 @@ module Gitlab
 
           private
 
+          include TimeHelper
+
           def execute_in
-            diff = [0, subject.scheduled_at - Time.now].max
-            Time.at(diff).utc.strftime("%H:%M:%S")
+            remaining_seconds = [0, subject.scheduled_at - Time.now].max
+            duration_in_numbers(remaining_seconds, true)
           end
         end
       end
diff --git a/spec/helpers/time_helper_spec.rb b/spec/helpers/time_helper_spec.rb
index 0b371d69ecf..37455c3e491 100644
--- a/spec/helpers/time_helper_spec.rb
+++ b/spec/helpers/time_helper_spec.rb
@@ -20,17 +20,35 @@ describe TimeHelper do
   end
 
   describe "#duration_in_numbers" do
-    it "returns minutes and seconds" do
-      durations_and_expectations = {
-        100 => "01:40",
-        121 => "02:01",
-        3721 => "01:02:01",
-        0 => "00:00",
-        42 => "00:42"
-      }
+    using RSpec::Parameterized::TableSyntax
+
+    context "without passing allow_overflow" do
+      where(:duration, :formatted_string) do
+        0                              | "00:00"
+        1.second                       | "00:01"
+        42.seconds                     | "00:42"
+        2.minutes + 1.second           | "02:01"
+        3.hours + 2.minutes + 1.second | "03:02:01"
+        30.hours                       | "06:00:00"
+      end
+
+      with_them do
+        it { expect(duration_in_numbers(duration)).to eq formatted_string }
+      end
+    end
+
+    context "with allow_overflow = true" do
+      where(:duration, :formatted_string) do
+        0                              | "00:00"
+        1.second                       | "00:01"
+        42.seconds                     | "00:42"
+        2.minutes + 1.second           | "02:01"
+        3.hours + 2.minutes + 1.second | "03:02:01"
+        30.hours                       | "30:00:00"
+      end
 
-      durations_and_expectations.each do |duration, expectation|
-        expect(duration_in_numbers(duration)).to eq(expectation)
+      with_them do
+        it { expect(duration_in_numbers(duration, true)).to eq formatted_string }
       end
     end
   end