diff options
author | Stan Hu <stanhu@gmail.com> | 2016-05-28 19:54:17 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2016-08-11 15:36:35 -0700 |
commit | cb8a425ba42e9be23b8712ed29b1db2dcc6bd139 (patch) | |
tree | 632b9c50748615409e6318176706a67a1fd05bab /spec/controllers/admin/groups_controller_spec.rb | |
parent | d4f987b2861ecec75b06d5efc2ad59e31a383337 (diff) | |
download | gitlab-ce-cb8a425ba42e9be23b8712ed29b1db2dcc6bd139.tar.gz |
Fix bug where destroying a namespace would not always destroy projects
There is a race condition in DestroyGroupService now that projects are deleted asynchronously:
1. User attempts to delete group
2. DestroyGroupService iterates through all projects and schedules a Sidekiq job to delete each Project
3. DestroyGroupService destroys the Group, leaving all its projects without a namespace
4. Projects::DestroyService runs later but the can?(current_user,
:remove_project) is `false` because the user no longer has permission to
destroy projects with no namespace.
5. This leaves the project in pending_delete state with no namespace/group.
Projects without a namespace or group also adds another problem: it's not possible to destroy the container
registry tags, since container_registry_path_with_namespace is the wrong value.
The fix is to destroy the group asynchronously and to run execute directly on Projects::DestroyService.
Closes #17893
Diffstat (limited to 'spec/controllers/admin/groups_controller_spec.rb')
-rw-r--r-- | spec/controllers/admin/groups_controller_spec.rb | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb new file mode 100644 index 00000000000..0239aea47fb --- /dev/null +++ b/spec/controllers/admin/groups_controller_spec.rb @@ -0,0 +1,24 @@ +require 'spec_helper' + +describe Admin::GroupsController do + let(:group) { create(:group) } + let(:project) { create(:project, namespace: group) } + let(:admin) { create(:admin) } + + before do + sign_in(admin) + Sidekiq::Testing.fake! + end + + describe 'DELETE #destroy' do + it 'schedules a group destroy' do + expect { delete :destroy, id: project.group.path }.to change(GroupDestroyWorker.jobs, :size).by(1) + end + + it 'redirects to the admin group path' do + delete :destroy, id: project.group.path + + expect(response).to redirect_to(admin_groups_path) + end + end +end |