diff options
author | Stan Hu <stanhu@gmail.com> | 2018-10-10 22:15:56 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-10-10 23:24:06 +0300 |
commit | fbb5953ec36ae3e53f9a07f5a0d1cf1b5e1ef209 (patch) | |
tree | 83045ae3ed3a36c35594b42bae665b10c25056de /spec | |
parent | 2efbc75fd427678a6a0b9910d1ba13f9065557ea (diff) |
Fix project deletion when there is a export available
Project deletions were failing with "Can't modify frozen hash" because:
1. Project#remove_exports was called in the after_destroy hook
2. This would remove the file and update ImportExportUpload
3. ImportExportUpload#save would attempt to write to a destroyed model
To avoid this, we just check if ImportExportUpload has been destroyed
before attempting to save it.
This would have a side effect of not running after_commit hooks to delete the
repository on disk, making it impossible to delete the project entirely.
Closes #52362
Diffstat (limited to 'spec')
-rw-r--r-- | spec/services/projects/destroy_service_spec.rb | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/spec/services/projects/destroy_service_spec.rb b/spec/services/projects/destroy_service_spec.rb index beff499f2be..1d31d26f418 100644 --- a/spec/services/projects/destroy_service_spec.rb +++ b/spec/services/projects/destroy_service_spec.rb @@ -65,10 +65,12 @@ describe Projects::DestroyService do context 'Sidekiq inline' do before do - # Run sidekiq immediatly to check that renamed repository will be removed + # Run sidekiq immediately to check that renamed repository will be removed perform_enqueued_jobs { destroy_project(project, user, {}) } end + it_behaves_like 'deleting the project' + context 'when has remote mirrors' do let!(:project) do create(:project, :repository, namespace: user.namespace).tap do |project| @@ -82,13 +84,28 @@ describe Projects::DestroyService do end end - it_behaves_like 'deleting the project' - it 'invalidates personal_project_count cache' do expect(user).to receive(:invalidate_personal_projects_count) destroy_project(project, user) end + + context 'when project has exports' do + let!(:project_with_export) do + create(:project, :repository, namespace: user.namespace).tap do |project| + create(:import_export_upload, + project: project, + export_file: fixture_file_upload('spec/fixtures/project_export.tar.gz')) + end + end + let!(:async) { true } + + it 'destroys project and export' do + expect { destroy_project(project_with_export, user) }.to change(ImportExportUpload, :count).by(-1) + + expect(Project.all).not_to include(project_with_export) + end + end end context 'Sidekiq fake' do |