Commit fef855e7 authored by Thong Kuah's avatar Thong Kuah

Merge branch 'fix-phase4-specs-v2' into 'fix-phase4-specs'

Explicitly mark cross-database modification for `dast_*_profile`

See merge request gitlab-org/gitlab!77979
parents d09bdf2a 465421f0
......@@ -38,8 +38,10 @@ RSpec.describe Ci::RetryBuildService do
end
it 'clones the profile associations', :aggregate_failures do
expect(new_build.dast_site_profile).to eq(dast_site_profile)
expect(new_build.dast_scanner_profile).to eq(dast_scanner_profile)
::Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification.allow_cross_database_modification_within_transaction(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/350051') do
expect(new_build.dast_site_profile).to eq(dast_site_profile)
expect(new_build.dast_scanner_profile).to eq(dast_scanner_profile)
end
end
end
......
- "./ee/spec/replicators/geo/terraform_state_version_replicator_spec.rb"
- "./ee/spec/services/ci/retry_build_service_spec.rb"
- "./spec/features/issues/issue_detail_spec.rb"
- "./spec/features/projects/pipelines/pipeline_spec.rb"
- "./spec/features/signed_commits_spec.rb"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment