summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrpereira2 <rpereira@gitlab.com>2019-06-19 16:50:00 +0530
committerrpereira2 <rpereira@gitlab.com>2019-06-19 16:50:00 +0530
commit9d67a3d17ca5167ddab55009ad5fc7742a6b75cf (patch)
treebd684c3d7c5e1c9b7bff35df724d5589bddf4aab
parent08ed6b1720ff4d6e2b45a97000a106071d650194 (diff)
downloadgitlab-ce-9d67a3d17ca5167ddab55009ad5fc7742a6b75cf.tar.gz
Change docs to recommend perform_enqueued_jobsupdate-sidekiq-inline-testing-docs
- Instead of Sidekiq::Testing.inline!, recommend the use of perform_enqueued_jobs. This is due to the changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20768
-rw-r--r--doc/development/testing_guide/best_practices.md2
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.