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
This commit is contained in:
Rémy Coutable 2019-07-01 15:28:12 +00:00
commit 77212dd5ec
1 changed files with 1 additions and 1 deletions

View File

@ -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.