Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 16 insertions, 0 deletions

diff --git a/lib/gitlab/ci/reports/test_suite.rb b/lib/gitlab/ci/reports/test_suite.rb
index 5ee779227ec..e9b78b841e4 100644
--- a/lib/gitlab/ci/reports/test_suite.rb
+++ b/lib/gitlab/ci/reports/test_suite.rb
@@ -78,11 +78,27 @@ module Gitlab
           end
         end
 
+        def sorted
+          sort_by_status
+          sort_by_execution_time_desc
+          self
+        end
+
         private
 
         def existing_key?(test_case)
           @test_cases[test_case.status]&.key?(test_case.key)
         end
+
+        def sort_by_status
+          @test_cases = @test_cases.sort_by { |status, _| Gitlab::Ci::Reports::TestCase::STATUS_TYPES.index(status) }.to_h
+        end
+
+        def sort_by_execution_time_desc
+          @test_cases = @test_cases.keys.each_with_object({}) do |key, hash|
+            hash[key] = @test_cases[key].sort_by { |_key, test_case| -test_case.execution_time }.to_h
+          end
+        end
       end
     end
   end