diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-13 03:16:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-13 03:16:12 +0300 |
commit | 4dc620034e192cdfb4dab5908a2f406e37e76b68 (patch) | |
tree | 9cd1069bce3d425254639309cb4fc4bda396c9ac /spec/support | |
parent | d36c792351474304405b5a1033dc2c4815ebc0e4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support')
-rw-r--r-- | spec/support/database/cross-database-modification-allowlist.yml | 11 | ||||
-rw-r--r-- | spec/support/shared_examples/models/update_project_statistics_shared_examples.rb | 6 |
2 files changed, 3 insertions, 14 deletions
diff --git a/spec/support/database/cross-database-modification-allowlist.yml b/spec/support/database/cross-database-modification-allowlist.yml index 91a4bff22c5..fe51488c706 100644 --- a/spec/support/database/cross-database-modification-allowlist.yml +++ b/spec/support/database/cross-database-modification-allowlist.yml @@ -1,10 +1 @@ -- "./ee/spec/replicators/geo/terraform_state_version_replicator_spec.rb" -- "./spec/features/issues/issue_detail_spec.rb" -- "./spec/features/projects/pipelines/pipeline_spec.rb" -- "./spec/features/signed_commits_spec.rb" -- "./spec/lib/gitlab/ci/pipeline/chain/create_spec.rb" -- "./spec/models/ci/build_trace_chunk_spec.rb" -- "./spec/models/ci/job_artifact_spec.rb" -- "./spec/models/clusters/applications/runner_spec.rb" -- "./spec/requests/api/commits_spec.rb" -- "./spec/services/ci/retry_build_service_spec.rb" +[] diff --git a/spec/support/shared_examples/models/update_project_statistics_shared_examples.rb b/spec/support/shared_examples/models/update_project_statistics_shared_examples.rb index 2e01de2ea84..06326ffac97 100644 --- a/spec/support/shared_examples/models/update_project_statistics_shared_examples.rb +++ b/spec/support/shared_examples/models/update_project_statistics_shared_examples.rb @@ -115,16 +115,14 @@ RSpec.shared_examples 'UpdateProjectStatistics' do |with_counter_attribute| expect(ProjectStatistics) .not_to receive(:increment_statistic) - project.update!(pending_delete: true) - project.destroy! + expect(Projects::DestroyService.new(project, project.owner).execute).to eq(true) end it 'does not schedule a namespace statistics worker' do expect(Namespaces::ScheduleAggregationWorker) .not_to receive(:perform_async) - project.update!(pending_delete: true) - project.destroy! + expect(Projects::DestroyService.new(project, project.owner).execute).to eq(true) end end end |