diff --git a/ee/spec/graphql/types/vulnerability_type_spec.rb b/ee/spec/graphql/types/vulnerability_type_spec.rb index 1b74d3f1015629b1ded368da410624b9e5e2d5e7..1e28512bb751acb518b9840aa6ff4d4b61ddf355 100644 --- a/ee/spec/graphql/types/vulnerability_type_spec.rb +++ b/ee/spec/graphql/types/vulnerability_type_spec.rb @@ -150,7 +150,7 @@ end end - describe 'has_remediations' do + describe 'has_remediations', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/534855' do let(:query_field) { 'hasRemediations' } context 'N+1 queries' do @@ -243,7 +243,7 @@ expect(vulnerabilities.first['primaryIdentifier']['externalId']).to eq(vulnerability.finding.primary_identifier.external_id) end - context "N+1 issues" do + context "N+1 issues", quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/546298' do single_query_count = 11 it_behaves_like "N+1 queries", single_query_count @@ -534,7 +534,7 @@ end end - context 'N+1 queries' do + context 'N+1 queries', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/546294' do single_query_count = 11 it_behaves_like "N+1 queries", single_query_count @@ -550,7 +550,7 @@ expect(vulnerabilities.first.dig('externalIssueLinks', 'edges').first.dig('node', 'id')).to eq(external_issue_link.to_global_id.to_s) end - context 'N+1 queries' do + context 'N+1 queries', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/546300' do single_query_count = 11 it_behaves_like "N+1 queries", single_query_count @@ -566,7 +566,7 @@ expect(vulnerabilities.first['links'].first['name']).to eq(finding_link.name) end - context 'N+1 queries' do + context 'N+1 queries', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/547390' do single_query_count = 11 it_behaves_like "N+1 queries", single_query_count @@ -624,7 +624,7 @@ end end - context 'N+1 queries' do + context 'N+1 queries', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/549933' do single_query_count = 11 it_behaves_like "N+1 queries", single_query_count @@ -653,7 +653,7 @@ end end - context 'N+1 queries' do + context 'N+1 queries', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/550360' do single_query_count = 11 it_behaves_like "N+1 queries", single_query_count diff --git a/ee/spec/models/vulnerabilities/archive_spec.rb b/ee/spec/models/vulnerabilities/archive_spec.rb index cd2be03cda2d3cfd6787baaffcac66afb2222583..2ddfae1d63076f110538ce1bae5de950cfb51b0e 100644 --- a/ee/spec/models/vulnerabilities/archive_spec.rb +++ b/ee/spec/models/vulnerabilities/archive_spec.rb @@ -5,9 +5,11 @@ RSpec.describe Vulnerabilities::Archive, feature_category: :vulnerability_management do subject(:archive) { build(:vulnerability_archive) } - it_behaves_like 'cleanup by a loose foreign key' do - let_it_be(:parent) { create(:project) } - let_it_be(:model) { create(:vulnerability_archive, project: parent) } + context 'with quarantine', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/527884' do + it_behaves_like 'cleanup by a loose foreign key' do + let_it_be(:parent) { create(:project) } + let_it_be(:model) { create(:vulnerability_archive, project: parent) } + end end it { is_expected.to belong_to(:project).required } diff --git a/ee/spec/models/vulnerabilities/external_issue_link_spec.rb b/ee/spec/models/vulnerabilities/external_issue_link_spec.rb index 84bf6d00f99531ba0fe9a8fe8cbcd8423444a201..66f2be7e0da2c4fd0e9238c344486c615476ce3d 100644 --- a/ee/spec/models/vulnerabilities/external_issue_link_spec.rb +++ b/ee/spec/models/vulnerabilities/external_issue_link_spec.rb @@ -54,7 +54,8 @@ end end - context 'with loose foreign key on vulnerabilities_external_issue_links.project_id' do + context 'with loose foreign key on vulnerabilities_external_issue_links.project_id', + quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/526543' do it_behaves_like 'cleanup by a loose foreign key' do let_it_be(:parent) { create(:project) } let_it_be(:model) { create(:vulnerabilities_external_issue_link, project_id: parent.id) } diff --git a/ee/spec/models/vulnerabilities/finding/evidence_spec.rb b/ee/spec/models/vulnerabilities/finding/evidence_spec.rb index 75d2cd77e68ae189bc104795be518c2d9904e8c0..92f548799b702396cc5d8b2695b653c0d028b140 100644 --- a/ee/spec/models/vulnerabilities/finding/evidence_spec.rb +++ b/ee/spec/models/vulnerabilities/finding/evidence_spec.rb @@ -7,7 +7,8 @@ it { is_expected.to validate_length_of(:data).is_at_most(16_000_000) } it { is_expected.to belong_to(:finding).required } - context 'with loose foreign key on vulnerability_finding_evidences.project_id' do + context 'with loose foreign key on vulnerability_finding_evidences.project_id', + quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/531136' do it_behaves_like 'cleanup by a loose foreign key' do let_it_be(:parent) { create(:project) } let_it_be(:model) { create(:vulnerabilties_finding_evidence, project_id: parent.id) } diff --git a/ee/spec/models/vulnerabilities/finding_remediation_spec.rb b/ee/spec/models/vulnerabilities/finding_remediation_spec.rb index e07b39421b852d552934e12b4e80d90fdb48a7a3..7361b343bea7fc72794d485d21790e36f16757a6 100644 --- a/ee/spec/models/vulnerabilities/finding_remediation_spec.rb +++ b/ee/spec/models/vulnerabilities/finding_remediation_spec.rb @@ -15,7 +15,8 @@ it { is_expected.to eq(remediation.finding_remediations) } end - context 'with loose foreign key on vulnerability_findings_remediations.project_id' do + context 'with loose foreign key on vulnerability_findings_remediations.project_id', + quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/526104' do it_behaves_like 'cleanup by a loose foreign key' do let_it_be(:parent) { create(:project) } let_it_be(:finding_1) { create(:vulnerabilities_finding, project_id: parent.id) } diff --git a/ee/spec/models/vulnerabilities/finding_signature_spec.rb b/ee/spec/models/vulnerabilities/finding_signature_spec.rb index 607583a8717d0d1dafbd0eada6541b539554f2df..992ffe92a3ed0bb192331025ee4375d5d838d857 100644 --- a/ee/spec/models/vulnerabilities/finding_signature_spec.rb +++ b/ee/spec/models/vulnerabilities/finding_signature_spec.rb @@ -86,7 +86,8 @@ end end - context 'with loose foreign key on vulnerability_finding_signatures.project_id' do + context 'with loose foreign key on vulnerability_finding_signatures.project_id', + quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/526187' do it_behaves_like 'cleanup by a loose foreign key' do let_it_be(:parent) { create(:project) } let_it_be(:model) { create(:vulnerabilities_finding_signature, project_id: parent.id) } diff --git a/ee/spec/models/vulnerabilities/finding_spec.rb b/ee/spec/models/vulnerabilities/finding_spec.rb index cc834d51561c2a759b674d7b603258f311b7c80d..3ce50d5d1fe8fdba9f945f9f7c90b5604587babd 100644 --- a/ee/spec/models/vulnerabilities/finding_spec.rb +++ b/ee/spec/models/vulnerabilities/finding_spec.rb @@ -1948,7 +1948,8 @@ def create_finding(state) end end - context 'with loose foreign key on vulnerability_occurrences.project_id' do + context 'with loose foreign key on vulnerability_occurrences.project_id', + quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/526594' do it_behaves_like 'cleanup by a loose foreign key' do let_it_be(:parent) { create(:project) } let_it_be(:model) { create(:vulnerabilities_finding, vulnerability_project: parent) } diff --git a/ee/spec/models/vulnerabilities/historical_statistic_spec.rb b/ee/spec/models/vulnerabilities/historical_statistic_spec.rb index fb6975cc4e2f20c17d8bc9900715c3b4df00b754..323f41ab654466c31c30df4cf684f809bc60d184 100644 --- a/ee/spec/models/vulnerabilities/historical_statistic_spec.rb +++ b/ee/spec/models/vulnerabilities/historical_statistic_spec.rb @@ -96,7 +96,8 @@ it { is_expected.to match_array(expected_collection) } end - context 'with loose foreign key on vulnerability_historical_statistics.project_id' do + context 'with loose foreign key on vulnerability_historical_statistics.project_id', + quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/526741' do it_behaves_like 'cleanup by a loose foreign key' do let_it_be(:parent) { create(:project) } let_it_be(:model) { create(:vulnerability_historical_statistic, project: parent) } diff --git a/ee/spec/models/vulnerabilities/issue_link_spec.rb b/ee/spec/models/vulnerabilities/issue_link_spec.rb index bb0dab00adf240f4585a31d2667ff4426739fcaf..962823b838cd79322fa328deaee987270856eade 100644 --- a/ee/spec/models/vulnerabilities/issue_link_spec.rb +++ b/ee/spec/models/vulnerabilities/issue_link_spec.rb @@ -123,7 +123,8 @@ end end - context 'with loose foreign key on vulnerabilities_issue_link.project_id' do + context 'with loose foreign key on vulnerabilities_issue_link.project_id', + quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/526546' do it_behaves_like 'cleanup by a loose foreign key' do let_it_be(:parent) { create(:project) } let_it_be(:model) { create(:vulnerabilities_issue_link, project_id: parent.id) } diff --git a/ee/spec/models/vulnerabilities/merge_request_link_spec.rb b/ee/spec/models/vulnerabilities/merge_request_link_spec.rb index 75c73b97eef4b112ba7fe37a81b1104a7b79fc84..eba1d82f5faaa9343b50a526ea4037c8ba92dfa7 100644 --- a/ee/spec/models/vulnerabilities/merge_request_link_spec.rb +++ b/ee/spec/models/vulnerabilities/merge_request_link_spec.rb @@ -112,7 +112,8 @@ end end - context 'with loose foreign key on vulnerability_merge_request_links.project_id' do + context 'with loose foreign key on vulnerability_merge_request_links.project_id', + quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/526296' do it_behaves_like 'cleanup by a loose foreign key' do let_it_be(:parent) { create(:project) } let_it_be(:model) { create(:vulnerabilities_merge_request_link, project_id: parent.id) } diff --git a/ee/spec/models/vulnerabilities/scanner_spec.rb b/ee/spec/models/vulnerabilities/scanner_spec.rb index ea5f19c11d0f2fb6a1439ce9d83a43c7ab9d7314..e016c97626346fae5785ffbddb7335eeb6afff37 100644 --- a/ee/spec/models/vulnerabilities/scanner_spec.rb +++ b/ee/spec/models/vulnerabilities/scanner_spec.rb @@ -83,7 +83,8 @@ end end - context 'with loose foreign key on vulnerability_scanners.project_id' do + context 'with loose foreign key on vulnerability_scanners.project_id', + quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/526449' do it_behaves_like 'cleanup by a loose foreign key' do let_it_be(:parent) { create(:project) } let_it_be(:model) { create(:vulnerabilities_scanner, project: parent) } diff --git a/ee/spec/models/vulnerabilities/severity_override_spec.rb b/ee/spec/models/vulnerabilities/severity_override_spec.rb index f25a751c99c3c0aaeaa44aff50af2a25c7948b9e..af3646b0528acea75cc2d737628d4fcbb81ebf06 100644 --- a/ee/spec/models/vulnerabilities/severity_override_spec.rb +++ b/ee/spec/models/vulnerabilities/severity_override_spec.rb @@ -58,7 +58,8 @@ end end - context 'with loose foreign key on vulnerability_severity_overrides.project_id' do + context 'with loose foreign key on vulnerability_severity_overrides.project_id', + quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/526135' do it_behaves_like 'cleanup by a loose foreign key' do let_it_be(:parent) { create(:project) } let_it_be(:model) { create(:vulnerability_severity_override, project_id: parent.id) } diff --git a/ee/spec/models/vulnerability_user_mention_spec.rb b/ee/spec/models/vulnerability_user_mention_spec.rb index 0eeba3b266beb0acd83d4f0734faff52e068679f..16ba10d117289d74a4ea71ad1d0b3315dc0b9c56 100644 --- a/ee/spec/models/vulnerability_user_mention_spec.rb +++ b/ee/spec/models/vulnerability_user_mention_spec.rb @@ -13,7 +13,8 @@ let_it_be(:mentionable) { create(:vulnerability) } end - context 'with loose foreign key on vulnerability_user_mentions.project_id' do + context 'with loose foreign key on vulnerability_user_mentions.project_id', + quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/526347' do it_behaves_like 'cleanup by a loose foreign key' do let_it_be(:parent) { create(:project) } let_it_be(:model) { create(:vulnerability_user_mention, project_id: parent.id) } diff --git a/ee/spec/requests/api/graphql/project/sbom/dependencies_spec.rb b/ee/spec/requests/api/graphql/project/sbom/dependencies_spec.rb index fbf56659d902a5411563b74339503cf17483001f..aed6c235299fc65131bf45f6b9c2a721aa300ded 100644 --- a/ee/spec/requests/api/graphql/project/sbom/dependencies_spec.rb +++ b/ee/spec/requests/api/graphql/project/sbom/dependencies_spec.rb @@ -51,7 +51,9 @@ def package_manager_enum(value) subject { post_graphql(query, current_user: current_user, variables: variables) } - it_behaves_like 'sbom dependency node' + context 'with quarantine', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/545088' do + it_behaves_like 'sbom dependency node' + end it 'returns the expected dependency data with all fields' do subject @@ -161,7 +163,7 @@ def package_manager_enum(value) FIELDS end - it 'avoids N+1 database queries' do + it 'avoids N+1 database queries', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/567758' do parent = occurrences.first # create 1 occurrence and 1 graph path