diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-07-01 18:28:12 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-07-01 18:28:12 +0300 |
| commit | 77212dd5eccc0ef154c088f9bafb4bede4acc86f (patch) | |
| tree | 881b567b102e4120789487b6aee407ea27948678 /doc/development | |
| parent | 80e09ed0105343c90f3dac77aa7e297a294f3f5e (diff) | |
| parent | 9d67a3d17ca5167ddab55009ad5fc7742a6b75cf (diff) | |
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
Diffstat (limited to 'doc/development')
| -rw-r--r-- | doc/development/testing_guide/best_practices.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/testing_guide/best_practices.md b/doc/development/testing_guide/best_practices.md index 71e3b7740cb..448d9fd01c4 100644 --- a/doc/development/testing_guide/best_practices.md +++ b/doc/development/testing_guide/best_practices.md @@ -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. 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 ensure that they are removed once the spec completes. |