Merge branch '4332-unapproved-check' into 'master'

Resolve "Update docker report `unapproved`"

Closes #4332

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

changelogs/unreleased-ee/4332-unapproved-check.yml

+---
+title: Remove unaproved typo check in sast:container report
+merge_request:
+author:
+type: other

ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js

@@ -90,10 +90,7 @@ export default class MergeRequestStore extends CEMergeRequestStore {
 
     this.dockerReport.vulnerabilities = parsedVulnerabilities || [];
 
-    // There is a typo in the original repo:
-    // https://github.com/arminc/clair-scanner/pull/39/files
-    // Fix this when the above PR is accepted
-    const unapproved = data.unapproved || data.unaproved || [];
+    const unapproved = data.unapproved || [];
 
     // Approved can be calculated by subtracting unapproved from vulnerabilities.
     this.dockerReport.approved = parsedVulnerabilities

spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js

@@ -145,21 +145,6 @@ describe('MergeRequestStore', () => {
       expect(store.dockerReport.approved).toEqual(dockerReportParsed.approved);
       expect(store.dockerReport.unapproved).toEqual(dockerReportParsed.unapproved);
     });
-
-    it('handles unaproved typo', () => {
-      store.setDockerReport({
-        vulnerabilities: [
-          {
-            vulnerability: 'CVE-2017-12944',
-            namespace: 'debian:8',
-            severity: 'Medium',
-          },
-        ],
-        unaproved: ['CVE-2017-12944'],
-      });
-
-      expect(store.dockerReport.unapproved[0].vulnerability).toEqual('CVE-2017-12944');
-    });
   });
 
   describe('parseDockerVulnerabilities', () => {