Merge branch '6366_fix_vulnerability_confidence_and_severity_display' into 'master'

Ensure Severity and Confidence are displayed independently for SAST vulnerabilities.

See merge request gitlab-org/gitlab-ee!6065

ee/app/assets/javascripts/vue_shared/security_reports/components/sast_issue_body.vue

@@ -28,6 +28,12 @@ export default {
       <template v-if="issue.severity && issue.confidence">
         {{ issue.severity }} ({{ issue.confidence }}):
       </template>
+      <template v-else-if="issue.severity">
+        {{ issue.severity }}:
+      </template>
+      <template v-else-if="issue.confidence">
+        ({{ issue.confidence }}):
+      </template>
       <template v-else-if="issue.priority">{{ issue.priority }}:</template>
 
       <modal-open-name :issue="issue" />

spec/javascripts/vue_shared/security_reports/components/sast_issue_body_spec.js

@@ -33,21 +33,31 @@ describe('sast issue body', () => {
         issue: sastIssue,
       });
 
-      expect(vm.$el.textContent.trim()).toContain(`${sastIssue.severity} (${sastIssue.confidence})`);
+      expect(vm.$el.textContent.trim()).toContain(`${sastIssue.severity} (${sastIssue.confidence}):`);
     });
   });
 
-  describe('without severity', () => {
-    it('does not render severity nor confidence', () => {
+  describe('with severity and without confidence (new json format)', () => {
+    it('renders severity only', () => {
       const issueCopy = Object.assign({}, sastIssue);
-      delete issueCopy.severity;
+      delete issueCopy.confidence;
+      vm = mountComponent(Component, {
+        issue: issueCopy,
+      });
 
+      expect(vm.$el.textContent.trim()).toContain(`${issueCopy.severity}:`);
+    });
+  });
+
+  describe('with confidence and without severity (new json format)', () => {
+    it('renders confidence only', () => {
+      const issueCopy = Object.assign({}, sastIssue);
+      delete issueCopy.severity;
       vm = mountComponent(Component, {
         issue: issueCopy,
       });
 
-      expect(vm.$el.textContent.trim()).not.toContain(sastIssue.severity);
-      expect(vm.$el.textContent.trim()).not.toContain(sastIssue.confidence);
+      expect(vm.$el.textContent.trim()).toContain(`(${issueCopy.confidence}):`);
     });
   });