Merge branch 'jlouw-209029-add-pipelines-to-compliance-dash' into 'master'

Add pipeline statuses to Compliance Dashboard

Closes #209029

See merge request gitlab-org/gitlab!28001

app/views/projects/merge_requests/_merge_request.html.haml

@@ -47,9 +47,7 @@
           %li.issuable-status.d-none.d-sm-inline-block
             = icon('ban')
             = _('CLOSED')
-        - if can?(current_user, :read_pipeline, merge_request.head_pipeline)
-          %li.issuable-pipeline-status.d-none.d-sm-flex
-            = render 'ci/status/icon', status: merge_request.head_pipeline.detailed_status(current_user), option_css_classes: 'd-flex'
+        = render 'shared/merge_request_pipeline_status', merge_request: merge_request
         - if merge_request.open? && merge_request.broken?
           %li.issuable-pipeline-broken.d-none.d-sm-flex
             = link_to merge_request_path(merge_request), class: "has-tooltip", title: _('Cannot be merged automatically') do

app/views/shared/_merge_request_pipeline_status.html.haml

+- if can?(current_user, :read_pipeline, merge_request.head_pipeline)
+  %li.issuable-pipeline-status.d-none.d-sm-flex
+    = render 'ci/status/icon', status: merge_request.head_pipeline.detailed_status(current_user), option_css_classes: 'd-flex'

ee/app/views/groups/security/compliance_dashboards/_merge_request.html.haml

@@ -8,6 +8,7 @@
 
     .issuable-meta
       %ul.controls
+        = render 'shared/merge_request_pipeline_status', merge_request: merge_request
         - if merge_request.approved_by_users.any?
           = render 'approvers', project: merge_request.project, merge_request: merge_request
         - else

ee/changelogs/unreleased/jlouw-209029-add-pipelines-to-compliance-dash.yml

+---
+title: Add pipeline statuses to Compliance Dashboard
+merge_request: 28001
+author:
+type: added

ee/spec/views/groups/security/compliance_dashboards/show.html.haml_spec.rb

@@ -23,6 +23,7 @@ describe 'groups/security/compliance_dashboards/show.html.haml' do
 
   context 'when there are merge requests' do
     let(:merge_request) { create(:merge_request, source_project: project, state: :merged) }
+    let(:current_user) { user }
 
     before do
       merge_request.metrics.update!(merged_at: 10.minutes.ago)
@@ -42,6 +43,45 @@ describe 'groups/security/compliance_dashboards/show.html.haml' do
       expect(rendered).to have_css('time', class: 'js-timeago')
     end
 
+    context 'with no pipeline' do
+      it 'renders no pipeline status icon' do
+        render
+
+        expect(rendered).not_to have_css('.ci-status-link')
+      end
+    end
+
+    context 'with a pipeline' do
+      context 'and the user is logged in' do
+        before do
+          sign_in(current_user)
+        end
+
+        ::Ci::Pipeline.bridgeable_statuses.each do |status|
+          context "and the status is #{status}" do
+            let!(:pipeline) { create(:ci_empty_pipeline, status: status, project: project, head_pipeline_of: merge_request) }
+
+            it "renders the pipeline status icon for #{status}" do
+              render
+
+              expect(rendered).to have_css(".ci-status-link.ci-status-icon-#{status}")
+            end
+          end
+        end
+      end
+
+      context 'and the user is not logged in' do
+        let(:status) { ::Ci::Pipeline.bridgeable_statuses.first }
+        let!(:pipeline) { create(:ci_empty_pipeline, status: status, project: project, head_pipeline_of: merge_request) }
+
+        it "does not render a pipeline status icon" do
+          render
+
+          expect(rendered).not_to have_css(".ci-status-link.ci-status-icon")
+        end
+      end
+    end
+
     context 'with no approvers' do
       it 'renders the message "No approvers"' do
         render