diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 15:09:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 15:09:22 +0300 |
commit | 286fe61013674fe2d245ffc8d2233baf09923e70 (patch) | |
tree | 2037291f5863105e54e75be056b49f7d62007cae /spec/requests/api/admin/sidekiq_spec.rb | |
parent | 4cb5e5011abfe8d50ac3a7ebd0018c563c6d7af4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests/api/admin/sidekiq_spec.rb')
-rw-r--r-- | spec/requests/api/admin/sidekiq_spec.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/requests/api/admin/sidekiq_spec.rb b/spec/requests/api/admin/sidekiq_spec.rb index 0fb8199eec6..303b62f4436 100644 --- a/spec/requests/api/admin/sidekiq_spec.rb +++ b/spec/requests/api/admin/sidekiq_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe API::Admin::Sidekiq do +describe API::Admin::Sidekiq, :clean_gitlab_redis_queues do let_it_be(:admin) { create(:admin) } describe 'DELETE /admin/sidekiq/queues/:queue_name' do @@ -21,20 +21,20 @@ describe API::Admin::Sidekiq do Sidekiq::Queue.new('authorized_projects').clear end - def add_job(user) + def add_job(user, args) Sidekiq::Client.push( 'class' => 'AuthorizedProjectsWorker', 'queue' => 'authorized_projects', - 'args' => [user.id], + 'args' => args, 'meta.user' => user.username ) end context 'valid request' do it 'returns info about the deleted jobs' do - add_job(admin) - add_job(admin) - add_job(create(:user)) + add_job(admin, [1]) + add_job(admin, [2]) + add_job(create(:user), [3]) delete api("/admin/sidekiq/queues/authorized_projects?user=#{admin.username}", admin) |