Commit 77212dd5 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'update-sidekiq-inline-testing-docs' into 'master'

Change docs to recommend perform_enqueued_jobs instead of Sidekiq::Testing.inline!

See merge request gitlab-org/gitlab-ce!29845
parents 80e09ed0 9d67a3d1
...@@ -327,7 +327,7 @@ However, if a spec makes direct Redis calls, it should mark itself with the ...@@ -327,7 +327,7 @@ However, if a spec makes direct Redis calls, it should mark itself with the
`:clean_gitlab_redis_queues` traits as appropriate. `:clean_gitlab_redis_queues` traits as appropriate.
Sidekiq jobs are typically not run in specs, but this behaviour can be altered Sidekiq jobs are typically not run in specs, but this behaviour can be altered
in each spec through the use of `Sidekiq::Testing.inline!` blocks. Any spec that in each spec through the use of `perform_enqueued_jobs` blocks. Any spec that
causes Sidekiq jobs to be pushed to Redis should use the `:sidekiq` trait, to causes Sidekiq jobs to be pushed to Redis should use the `:sidekiq` trait, to
ensure that they are removed once the spec completes. ensure that they are removed once the spec completes.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment