Skip to content
Snippets Groups Projects
Commit 92802e51 authored by Rémy Coutable's avatar Rémy Coutable
Browse files

Merge branch 'blackst0ne-replace-sidekiq-inline-with-perform-enqueued-jobs' into 'master'

Replace 'Sidekiq::Testing.inline!' with 'perform_enqueued_jobs'

Closes #22991

See merge request gitlab-org/gitlab-ce!20768
parents 771e9374 4691fd02
No related branches found
No related tags found
1 merge request!10495Merge Requests - Assignee
Loading
Loading
@@ -173,7 +173,7 @@ describe Users::DestroyService do
 
describe "user personal's repository removal" do
before do
Sidekiq::Testing.inline! { service.execute(user) }
perform_enqueued_jobs { service.execute(user) }
end
 
context 'legacy storage' do
Loading
Loading
Loading
Loading
@@ -13,7 +13,7 @@ describe StorageMigratorWorker do
end
 
it 'migrates projects in the specified range' do
Sidekiq::Testing.inline! do
perform_enqueued_jobs do
worker.perform(ids.min, ids.max)
end
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment