Add latest changes from gitlab-org/gitlab@12-10-stable-ee

1 files changed, 17 insertions, 1 deletions

diff --git a/spec/lib/gitlab/utils_spec.rb b/spec/lib/gitlab/utils_spec.rb
index d3780d22241..e34367cbbf9 100644
--- a/spec/lib/gitlab/utils_spec.rb
+++ b/spec/lib/gitlab/utils_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Gitlab::Utils do
   delegate :to_boolean, :boolean_to_yes_no, :slugify, :random_string, :which,
            :ensure_array_from_string, :to_exclusive_sentence, :bytes_to_megabytes,
-           :append_path, :check_path_traversal!, to: :described_class
+           :append_path, :check_path_traversal!, :ms_to_round_sec, to: :described_class
 
   describe '.check_path_traversal!' do
     it 'detects path traversal at the start of the string' do
@@ -55,6 +55,22 @@ describe Gitlab::Utils do
     end
   end
 
+  describe '.ms_to_round_sec' do
+    using RSpec::Parameterized::TableSyntax
+
+    where(:original, :expected) do
+      1999.8999 | 2
+      12384     | 12.38
+      333       | 0.33
+    end
+
+    with_them do
+      it "returns rounded seconds" do
+        expect(ms_to_round_sec(original)).to eq(expected)
+      end
+    end
+  end
+
   describe '.to_exclusive_sentence' do
     it 'calls #to_sentence on the array' do
       array = double