1 files changed, 13 insertions, 45 deletions
diff --git a/spec/services/security/merge_reports_service_spec.rb b/spec/services/security/merge_reports_service_spec.rb
index a101003a7dd..809d0b27c20 100644
--- a/spec/services/security/merge_reports_service_spec.rb
+++ b/spec/services/security/merge_reports_service_spec.rb
@@ -19,8 +19,7 @@ RSpec.describe Security::MergeReportsService, '#execute', feature_category: :cod
     build(:ci_reports_security_finding,
           identifiers: [identifier_1_primary, identifier_1_cve],
           scanner: scanner_1,
-          severity: :low,
-          uuid: '61eb8e3e-3be1-4d6c-ba26-4e0dd4f94610'
+          severity: :low
          )
   end
 
@@ -28,8 +27,7 @@ RSpec.describe Security::MergeReportsService, '#execute', feature_category: :cod
     build(:ci_reports_security_finding,
           identifiers: [identifier_1_primary, identifier_1_cve],
           scanner: scanner_1,
-          severity: :low,
-          uuid: '61eb8e3e-3be1-4d6c-ba26-4e0dd4f94611'
+          severity: :low
          )
   end
 
@@ -38,8 +36,7 @@ RSpec.describe Security::MergeReportsService, '#execute', feature_category: :cod
           identifiers: [identifier_2_primary, identifier_2_cve],
           location: build(:ci_reports_security_locations_sast, start_line: 32, end_line: 34),
           scanner: scanner_2,
-          severity: :medium,
-          uuid: '61eb8e3e-3be1-4d6c-ba26-4e0dd4f94612'
+          severity: :medium
          )
   end
 
@@ -48,8 +45,7 @@ RSpec.describe Security::MergeReportsService, '#execute', feature_category: :cod
           identifiers: [identifier_2_primary, identifier_2_cve],
           location: build(:ci_reports_security_locations_sast, start_line: 32, end_line: 34),
           scanner: scanner_2,
-          severity: :medium,
-          uuid: '61eb8e3e-3be1-4d6c-ba26-4e0dd4f94613'
+          severity: :medium
          )
   end
 
@@ -58,8 +54,7 @@ RSpec.describe Security::MergeReportsService, '#execute', feature_category: :cod
           identifiers: [identifier_2_primary, identifier_2_cve],
           location: build(:ci_reports_security_locations_sast, start_line: 42, end_line: 44),
           scanner: scanner_2,
-          severity: :medium,
-          uuid: '61eb8e3e-3be1-4d6c-ba26-4e0dd4f94614'
+          severity: :medium
          )
   end
 
@@ -67,8 +62,7 @@ RSpec.describe Security::MergeReportsService, '#execute', feature_category: :cod
     build(:ci_reports_security_finding,
           identifiers: [identifier_cwe],
           scanner: scanner_3,
-          severity: :high,
-          uuid: '61eb8e3e-3be1-4d6c-ba26-4e0dd4f94615'
+          severity: :high
          )
   end
 
@@ -76,8 +70,7 @@ RSpec.describe Security::MergeReportsService, '#execute', feature_category: :cod
     build(:ci_reports_security_finding,
           identifiers: [identifier_cwe],
           scanner: scanner_1,
-          severity: :critical,
-          uuid: '61eb8e3e-3be1-4d6c-ba26-4e0dd4f94616'
+          severity: :critical
          )
   end
 
@@ -85,8 +78,7 @@ RSpec.describe Security::MergeReportsService, '#execute', feature_category: :cod
     build(:ci_reports_security_finding,
           identifiers: [identifier_wasc],
           scanner: scanner_1,
-          severity: :medium,
-          uuid: '61eb8e3e-3be1-4d6c-ba26-4e0dd4f94617'
+          severity: :medium
          )
   end
 
@@ -94,8 +86,7 @@ RSpec.describe Security::MergeReportsService, '#execute', feature_category: :cod
     build(:ci_reports_security_finding,
           identifiers: [identifier_wasc],
           scanner: scanner_2,
-          severity: :critical,
-          uuid: '61eb8e3e-3be1-4d6c-ba26-4e0dd4f94618'
+          severity: :critical
          )
   end
 
@@ -199,8 +190,8 @@ RSpec.describe Security::MergeReportsService, '#execute', feature_category: :cod
            finding_cwe_2,
            finding_wasc_2,
            finding_cwe_1,
-           finding_id_2_loc_1,
            finding_id_2_loc_2,
+           finding_id_2_loc_1,
            finding_wasc_1,
            finding_id_1
          ])
@@ -226,32 +217,9 @@ RSpec.describe Security::MergeReportsService, '#execute', feature_category: :cod
     let(:identifier_cve) { build(:ci_reports_security_identifier, external_id: 'CVE-2019-123', external_type: 'cve') }
     let(:identifier_semgrep) { build(:ci_reports_security_identifier, external_id: 'rules.bandit.B105', external_type: 'semgrep_id') }
 
-    let(:finding_id_1) do
-      build(
-        :ci_reports_security_finding,
-        identifiers: [identifier_bandit, identifier_cve],
-        scanner: bandit_scanner,
-        report_type: :sast,
-        uuid: '21ab978a-7052-5428-af0b-c7a4b3fe5020')
-    end
-
-    let(:finding_id_2) do
-      build(
-        :ci_reports_security_finding,
-        identifiers: [identifier_cve],
-        scanner: semgrep_scanner,
-        report_type: :sast,
-        uuid: '21ab978a-7052-5428-af0b-c7a4b3fe5021')
-    end
-
-    let(:finding_id_3) do
-      build(
-        :ci_reports_security_finding,
-        identifiers: [identifier_semgrep],
-        scanner: semgrep_scanner,
-        report_type: :sast,
-        uuid: '21ab978a-7052-5428-af0b-c7a4b3fe5022')
-    end
+    let(:finding_id_1) { build(:ci_reports_security_finding, identifiers: [identifier_bandit, identifier_cve], scanner: bandit_scanner, report_type: :sast) }
+    let(:finding_id_2) { build(:ci_reports_security_finding, identifiers: [identifier_cve], scanner: semgrep_scanner, report_type: :sast) }
+    let(:finding_id_3) { build(:ci_reports_security_finding, identifiers: [identifier_semgrep], scanner: semgrep_scanner, report_type: :sast) }
 
     let(:bandit_report) do
       build(:ci_reports_security_report,