diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-08-15 23:26:40 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-08-15 23:26:40 +0200 |
commit | e8aab1cd1550dd14408ae4c7b51f45110898b949 (patch) | |
tree | ca058d53cbeff735fe3eb678299afddd8b4ed1ca /spec/controllers | |
parent | 804fa437581713608a714ae0a3912d44e0a1d026 (diff) | |
download | gitlab-ce-fix-failing-tests.tar.gz |
This fixes a long running tests due to changed Sidekiq statefix-failing-tests
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/admin/groups_controller_spec.rb | 5 | ||||
-rw-r--r-- | spec/controllers/groups_controller_spec.rb | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb index 0239aea47fb..602de72d23f 100644 --- a/spec/controllers/admin/groups_controller_spec.rb +++ b/spec/controllers/admin/groups_controller_spec.rb @@ -7,12 +7,13 @@ describe Admin::GroupsController do 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) + Sidekiq::Testing.fake! do + expect { delete :destroy, id: project.group.path }.to change(GroupDestroyWorker.jobs, :size).by(1) + end end it 'redirects to the admin group path' do diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb index 4ae6364207b..a763e2c5ba8 100644 --- a/spec/controllers/groups_controller_spec.rb +++ b/spec/controllers/groups_controller_spec.rb @@ -89,12 +89,13 @@ describe GroupsController do context 'as the group owner' do before do - Sidekiq::Testing.fake! sign_in(user) end it 'schedules a group destroy' do - expect { delete :destroy, id: group.path }.to change(GroupDestroyWorker.jobs, :size).by(1) + Sidekiq::Testing.fake! do + expect { delete :destroy, id: group.path }.to change(GroupDestroyWorker.jobs, :size).by(1) + end end it 'redirects to the root path' do |