Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 12 insertions, 13 deletions

diff --git a/spec/migrations/20220107064845_populate_vulnerability_reads_spec.rb b/spec/migrations/20220107064845_populate_vulnerability_reads_spec.rb
index 063a51227dd..1338f826537 100644
--- a/spec/migrations/20220107064845_populate_vulnerability_reads_spec.rb
+++ b/spec/migrations/20220107064845_populate_vulnerability_reads_spec.rb
@@ -3,17 +3,17 @@ require 'spec_helper'
 
 require_migration!
 
-RSpec.describe PopulateVulnerabilityReads, :migration do
-  let_it_be(:namespace) { table(:namespaces).create!(name: 'user', path: 'user') }
-  let_it_be(:user) { table(:users).create!(email: 'author@example.com', username: 'author', projects_limit: 10) }
-  let_it_be(:project) { table(:projects).create!(namespace_id: namespace.id) }
-  let_it_be(:scanner) { table(:vulnerability_scanners).create!(project_id: project.id, external_id: 'test 1', name: 'test scanner 1') }
-  let_it_be(:background_migration_jobs) { table(:background_migration_jobs) }
-  let_it_be(:vulnerabilities) { table(:vulnerabilities) }
-  let_it_be(:vulnerability_reads) { table(:vulnerability_reads) }
-  let_it_be(:vulnerabilities_findings) { table(:vulnerability_occurrences) }
-  let_it_be(:vulnerability_issue_links) { table(:vulnerability_issue_links) }
-  let_it_be(:vulnerability_ids) { [] }
+RSpec.describe PopulateVulnerabilityReads, :migration, feature_category: :vulnerability_management do
+  let!(:namespace) { table(:namespaces).create!(name: 'user', path: 'user') }
+  let!(:user) { table(:users).create!(email: 'author@example.com', username: 'author', projects_limit: 10) }
+  let!(:project) { table(:projects).create!(namespace_id: namespace.id) }
+  let!(:scanner) { table(:vulnerability_scanners).create!(project_id: project.id, external_id: 'test 1', name: 'test scanner 1') }
+  let!(:background_migration_jobs) { table(:background_migration_jobs) }
+  let!(:vulnerabilities) { table(:vulnerabilities) }
+  let!(:vulnerability_reads) { table(:vulnerability_reads) }
+  let!(:vulnerabilities_findings) { table(:vulnerability_occurrences) }
+  let!(:vulnerability_issue_links) { table(:vulnerability_issue_links) }
+  let!(:vulnerability_ids) { [] }
 
   before do
     stub_const("#{described_class}::BATCH_SIZE", 1)
@@ -80,8 +80,7 @@ RSpec.describe PopulateVulnerabilityReads, :migration do
 
   # rubocop:disable Metrics/ParameterLists
   def create_finding!(
-    id: nil,
-    vulnerability_id:, project_id:, scanner_id:, primary_identifier_id:,
+    vulnerability_id:, project_id:, scanner_id:, primary_identifier_id:, id: nil,
     name: "test", severity: 7, confidence: 7, report_type: 0,
     project_fingerprint: '123qweasdzxc', location_fingerprint: 'test',
     metadata_version: 'test', raw_metadata: 'test', uuid: SecureRandom.uuid)