Add latest changes from gitlab-org/gitlab@master

1 files changed, 21 insertions, 1 deletions

diff --git a/spec/lib/gitlab/time_tracking_formatter_spec.rb b/spec/lib/gitlab/time_tracking_formatter_spec.rb
index ab0611e6b6a..4203a76cbfb 100644
--- a/spec/lib/gitlab/time_tracking_formatter_spec.rb
+++ b/spec/lib/gitlab/time_tracking_formatter_spec.rb
@@ -4,7 +4,9 @@ require 'spec_helper'
 
 RSpec.describe Gitlab::TimeTrackingFormatter do
   describe '#parse' do
-    subject { described_class.parse(duration_string) }
+    let(:keep_zero) { false }
+
+    subject { described_class.parse(duration_string, keep_zero: keep_zero) }
 
     context 'positive durations' do
       let(:duration_string) { '3h 20m' }
@@ -25,6 +27,24 @@ RSpec.describe Gitlab::TimeTrackingFormatter do
         expect(subject).to eq(576_000)
       end
     end
+
+    context 'when the duration is zero' do
+      let(:duration_string) { '0h' }
+
+      context 'when keep_zero is false' do
+        it 'returns nil' do
+          expect(subject).to be_nil
+        end
+      end
+
+      context 'when keep_zero is true' do
+        let(:keep_zero) { true }
+
+        it 'returns zero' do
+          expect(subject).to eq(0)
+        end
+      end
+    end
   end
 
   describe '#output' do