Merge branch 'minac_simplify_security_training_specs' into 'master'

Simplify security training related tests

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130934



Merged-by: Etienne Baqué <ebaque@gitlab.com>
Approved-by: Gregory Havenga <11164960-ghavenga@users.noreply.gitlab.com>
Approved-by: Etienne Baqué <ebaque@gitlab.com>
Co-authored-by: Mehmet Emin INAC <minac@gitlab.com>

ee/spec/finders/security/training_providers/kontra_url_finder_spec.rb

@@ -2,15 +2,15 @@
 require 'spec_helper'
-RSpec.describe Security::TrainingProviders::KontraUrlFinder do
+RSpec.describe Security::TrainingProviders::KontraUrlFinder, feature_category: :vulnerability_management do
   include ReactiveCachingHelpers
   let_it_be(:provider_name) { 'Kontra' }
   let_it_be(:provider) { create(:security_training_provider, name: provider_name) }
   let_it_be(:identifier) { create(:vulnerabilities_identifier, external_type: 'cwe', external_id: 2, name: "cwe-2") }
   let_it_be(:dummy_url) { 'http://test.host/test' }
-  let_it_be(:identifier_external_id) { "[#{identifier.external_type}]-[#{identifier.external_id}]-[#{identifier.name}]" }
+  let(:identifier_external_id) { "[#{identifier.external_type}]-[#{identifier.external_id}]-[#{identifier.name}]" }
   let(:finder) { described_class.new(identifier.project, provider, identifier_external_id) }
   describe '#calculate_reactive_cache' do
@@ -42,7 +42,6 @@
     context "when external_type is not present in allowed list" do
       let_it_be(:identifier) { create(:vulnerabilities_identifier, external_type: 'invalid type', external_id: "A1", name: "A1. Injection") }
-      let_it_be(:identifier_external_id) { "[#{identifier.external_type}]-[#{identifier.external_id}]-[#{identifier.name}]" }
       it 'returns nil' do
         expect(finder.execute).to be_nil
@@ -57,8 +56,6 @@
       end
       context "when identifier contains CWE-{number} format" do
-        let_it_be(:identifier) { create(:vulnerabilities_identifier, external_type: 'cwe', external_id: "CWE-2") }
-
         it 'returns full url path with proper mapping key' do
           expect(finder.full_url).to eq('https://example.com/?cwe=2')
         end

ee/spec/finders/security/training_providers/secure_code_warrior_url_finder_spec.rb

@@ -2,15 +2,15 @@
 require 'spec_helper'
-RSpec.describe Security::TrainingProviders::SecureCodeWarriorUrlFinder do
+RSpec.describe Security::TrainingProviders::SecureCodeWarriorUrlFinder, feature_category: :vulnerability_management do
   include ReactiveCachingHelpers
   let_it_be(:provider_name) { 'Secure Code Warrior' }
   let_it_be(:provider) { create(:security_training_provider, name: provider_name) }
   let_it_be(:identifier) { create(:vulnerabilities_identifier, external_type: 'cwe', external_id: 2, name: "cwe-2") }
   let_it_be(:dummy_url) { 'http://test.host/test' }
-  let_it_be(:identifier_external_id) { "[#{identifier.external_type}]-[#{identifier.external_id}]-[#{identifier.name}]" }
+  let(:identifier_external_id) { "[#{identifier.external_type}]-[#{identifier.external_id}]-[#{identifier.name}]" }
   let(:finder) { described_class.new(identifier.project, provider, identifier_external_id) }
   describe '#execute' do
@@ -42,7 +42,6 @@
     context "when external_type is not present in allowed list" do
       let_it_be(:identifier) { create(:vulnerabilities_identifier, external_type: 'invalid type', external_id: "A1", name: "A1. Injection") }
-      let_it_be(:identifier_external_id) { "[#{identifier.external_type}]-[#{identifier.external_id}]-[#{identifier.name}]" }
       it 'returns nil' do
         expect(finder.execute).to be_nil
@@ -63,7 +62,6 @@
     context "when identifier contains owasp identifier" do
       let_it_be(:identifier) { create(:vulnerabilities_identifier, external_type: 'owasp', external_id: "A1", name: "A1. Injection") }
-      let_it_be(:identifier_external_id) { "[#{identifier.external_type}]-[#{identifier.external_id}]-[#{identifier.name}]" }
       it 'returns full url path with proper mapping key' do
         expect(finder.full_url).to eq("https://example.com/?Id=gitlab&MappingList=owasp-web-2017&MappingKey=A1")
@@ -84,7 +82,6 @@
   describe '#determine_mapping_key' do
     context 'when owasp' do
       let_it_be(:identifier) { create(:vulnerabilities_identifier, external_type: 'owasp', external_id: "A1", name: "A1. Injection") }
-      let_it_be(:identifier_external_id) { "[#{identifier.external_type}]-[#{identifier.external_id}]-[#{identifier.name}]" }
       it 'returns external_id' do
         expect(finder.determine_mapping_key).to eq(identifier.external_id)
@@ -93,7 +90,6 @@
     context 'when cwe' do
       let_it_be(:identifier) { create(:vulnerabilities_identifier, external_type: 'cwe', external_id: 2, name: 'cwe-2') }
-      let_it_be(:identifier_external_id) { "[#{identifier.external_type}]-[#{identifier.external_id}]-[#{identifier.name}]" }
       it 'returns parsed identifier name' do
         expect(finder.determine_mapping_key).to eq(identifier.name.split('-').last)
@@ -104,7 +100,6 @@
   describe '#determine_mapping_list' do
     context 'when owasp' do
       let(:identifier) { create(:vulnerabilities_identifier, external_type: 'owasp', external_id: external_id, name: name) }
-      let(:identifier_external_id) { "[#{identifier.external_type}]-[#{identifier.external_id}]-[#{identifier.name}]" }
       context 'when owasp-web-2017' do
         let(:external_id) { "A1" }
@@ -127,7 +122,6 @@
     context 'when cwe' do
       let_it_be(:identifier) { create(:vulnerabilities_identifier, external_type: 'cwe', external_id: 2, name: 'cwe-2') }
-      let_it_be(:identifier_external_id) { "[#{identifier.external_type}]-[#{identifier.external_id}]-[#{identifier.name}]" }
       it 'returns parsed identifier name' do
         expect(finder.determine_mapping_list).to eq(identifier.external_type)

ee/spec/finders/security/training_providers/secure_flag_url_finder_spec.rb

@@ -9,10 +9,8 @@
   let_it_be(:provider) { create(:security_training_provider, name: provider_name) }
   let_it_be(:identifier) { create(:vulnerabilities_identifier, external_type: 'cwe', external_id: 2, name: "cwe-2") }
   let_it_be(:dummy_url) { 'http://test.host/test' }
-  let_it_be(:identifier_external_id) do
-    "[#{identifier.external_type}]-[#{identifier.external_id}]-[#{identifier.name}]"
-  end
+  let(:identifier_external_id) { "[#{identifier.external_type}]-[#{identifier.external_id}]-[#{identifier.name}]" }
   let(:finder) { described_class.new(identifier.project, provider, identifier_external_id) }
   describe '#calculate_reactive_cache' do
@@ -60,10 +58,6 @@
         create(:vulnerabilities_identifier, external_type: 'invalid type', external_id: "A1", name: "A1. Injection")
       end
-      let_it_be(:identifier_external_id) do
-        "[#{identifier.external_type}]-[#{identifier.external_id}]-[#{identifier.name}]"
-      end
-
       it 'returns nil' do
         expect(finder.execute).to be_nil
       end
@@ -77,8 +71,6 @@
       end
       context "when identifier contains CWE-{number} format" do
-        let_it_be(:identifier) { create(:vulnerabilities_identifier, external_type: 'cwe', external_id: "CWE-2") }
-
         it 'returns full url path with proper mapping key' do
           expect(finder.full_url).to eq('https://example.com/?cwe=2')
         end