4 files changed, 55 insertions, 34 deletions
diff --git a/spec/lib/gitlab/ci/reports/codequality_reports_comparer_spec.rb b/spec/lib/gitlab/ci/reports/codequality_reports_comparer_spec.rb
index e289e59b281..effa2c43418 100644
--- a/spec/lib/gitlab/ci/reports/codequality_reports_comparer_spec.rb
+++ b/spec/lib/gitlab/ci/reports/codequality_reports_comparer_spec.rb
@@ -191,11 +191,12 @@ RSpec.describe Gitlab::Ci::Reports::CodequalityReportsComparer do
       end
 
       it 'includes the base report errors sorted by severity' do
-        expect(existing_errors).to eq([
-          blocker_degradation,
-          critical_degradation,
-          major_degradation
-        ])
+        expect(existing_errors).to eq(
+          [
+            blocker_degradation,
+            critical_degradation,
+            major_degradation
+          ])
       end
     end
 
@@ -242,11 +243,12 @@ RSpec.describe Gitlab::Ci::Reports::CodequalityReportsComparer do
       end
 
       it 'includes errors not found in the base report sorted by severity' do
-        expect(new_errors).to eq([
-          blocker_degradation,
-          critical_degradation,
-          minor_degradation
-        ])
+        expect(new_errors).to eq(
+          [
+            blocker_degradation,
+            critical_degradation,
+            minor_degradation
+          ])
       end
     end
 
@@ -304,11 +306,12 @@ RSpec.describe Gitlab::Ci::Reports::CodequalityReportsComparer do
       end
 
       it 'returns the base report errors not found in the head report, sorted by severity' do
-        expect(resolved_errors).to eq([
-          blocker_degradation,
-          critical_degradation,
-          minor_degradation
-        ])
+        expect(resolved_errors).to eq(
+          [
+            blocker_degradation,
+            critical_degradation,
+            minor_degradation
+          ])
       end
     end
 
diff --git a/spec/lib/gitlab/ci/reports/codequality_reports_spec.rb b/spec/lib/gitlab/ci/reports/codequality_reports_spec.rb
index f4b47893805..68e70525c55 100644
--- a/spec/lib/gitlab/ci/reports/codequality_reports_spec.rb
+++ b/spec/lib/gitlab/ci/reports/codequality_reports_spec.rb
@@ -103,15 +103,16 @@ RSpec.describe Gitlab::Ci::Reports::CodequalityReports do
     end
 
     it 'sorts degradations based on severity' do
-      expect(codequality_report.degradations.values).to eq([
-        blocker,
-        critical,
-        major,
-        major_2,
-        minor,
-        info,
-        unknown
-      ])
+      expect(codequality_report.degradations.values).to eq(
+        [
+          blocker,
+          critical,
+          major,
+          major_2,
+          minor,
+          info,
+          unknown
+        ])
     end
 
     context 'with non-existence and uppercase severities' do
@@ -126,12 +127,13 @@ RSpec.describe Gitlab::Ci::Reports::CodequalityReports do
       end
 
       it 'sorts unknown last' do
-        expect(other_report.degradations.values).to eq([
-          blocker,
-          uppercase_major,
-          minor,
-          non_existent
-        ])
+        expect(other_report.degradations.values).to eq(
+          [
+            blocker,
+            uppercase_major,
+            minor,
+            non_existent
+          ])
       end
     end
   end
diff --git a/spec/lib/gitlab/ci/reports/sbom/source_spec.rb b/spec/lib/gitlab/ci/reports/sbom/source_spec.rb
index cb30bd721dd..343c0d8c15c 100644
--- a/spec/lib/gitlab/ci/reports/sbom/source_spec.rb
+++ b/spec/lib/gitlab/ci/reports/sbom/source_spec.rb
@@ -12,8 +12,7 @@ RSpec.describe Gitlab::Ci::Reports::Sbom::Source do
         'source_file' => { 'path' => 'package.json' },
         'package_manager' => { 'name' => 'npm' },
         'language' => { 'name' => 'JavaScript' }
-      },
-      fingerprint: '4dbcb747e6f0fb3ed4f48d96b777f1d64acdf43e459fdfefad404e55c004a188'
+      }
     }
   end
 
@@ -22,8 +21,7 @@ RSpec.describe Gitlab::Ci::Reports::Sbom::Source do
   it 'has correct attributes' do
     expect(subject).to have_attributes(
       source_type: attributes[:type],
-      data: attributes[:data],
-      fingerprint: attributes[:fingerprint]
+      data: attributes[:data]
     )
   end
 end
diff --git a/spec/lib/gitlab/ci/reports/security/report_spec.rb b/spec/lib/gitlab/ci/reports/security/report_spec.rb
index ab0efb90901..d7f967f1c55 100644
--- a/spec/lib/gitlab/ci/reports/security/report_spec.rb
+++ b/spec/lib/gitlab/ci/reports/security/report_spec.rb
@@ -140,6 +140,24 @@ RSpec.describe Gitlab::Ci::Reports::Security::Report do
     it { is_expected.to eq(scanner_1) }
   end
 
+  describe '#primary_identifiers' do
+    it 'returns matching identifiers' do
+      scanner_with_identifiers = create(
+        :ci_reports_security_scanner,
+        external_id: 'external_id_1',
+        primary_identifiers: [create(:ci_reports_security_identifier, external_id: 'other_id', name: 'other_scanner')]
+      )
+      scanner_without_identifiers = create(
+        :ci_reports_security_scanner,
+        external_id: 'external_id_2')
+
+      report.add_scanner(scanner_with_identifiers)
+      report.add_scanner(scanner_without_identifiers)
+
+      expect(report.primary_identifiers).to eq(scanner_with_identifiers.primary_identifiers)
+    end
+  end
+
   describe '#add_error' do
     context 'when the message is not given' do
       it 'adds a new error to report with the generic error message' do