From 500a50d09a6a9691595dcb8fb89d84ec951f8424 Mon Sep 17 00:00:00 2001 From: Maxime Orefice Date: Wed, 26 May 2021 15:43:54 -0400 Subject: [PATCH] Sort code quality degradations by severity This commit sorts our code quality full report degradations by severity. --- ee/app/graphql/ee/types/ci/pipeline_type.rb | 2 +- .../graphql/project/pipeline/code_quality_reports_spec.rb | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ee/app/graphql/ee/types/ci/pipeline_type.rb b/ee/app/graphql/ee/types/ci/pipeline_type.rb index 2f489bc6e536e3..de4002c6455c0c 100644 --- a/ee/app/graphql/ee/types/ci/pipeline_type.rb +++ b/ee/app/graphql/ee/types/ci/pipeline_type.rb @@ -26,7 +26,7 @@ module PipelineType description: 'Code Quality degradations reported on the pipeline.' def code_quality_reports - pipeline.codequality_reports.all_degradations.presence + pipeline.codequality_reports.sort_degradations!.values.presence end end end diff --git a/ee/spec/requests/api/graphql/project/pipeline/code_quality_reports_spec.rb b/ee/spec/requests/api/graphql/project/pipeline/code_quality_reports_spec.rb index c09bec5d118f2e..30af648d26ba92 100644 --- a/ee/spec/requests/api/graphql/project/pipeline/code_quality_reports_spec.rb +++ b/ee/spec/requests/api/graphql/project/pipeline/code_quality_reports_spec.rb @@ -51,6 +51,14 @@ expect(degradation['line']).not_to be_nil end end + + it 'returns all the queried fields ordered by severity', :aggregate_failures do + post_graphql(query, current_user: current_user) + + codequality_severities = codequality_degradations.map { |degradation| degradation['severity'] } + + expect(codequality_severities).to eq(%w[MAJOR MAJOR MINOR]) + end end context 'when user is not a member of the project' do -- GitLab