summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2019-07-03 20:02:18 +0000
committerMayra Cabrera <mcabrera@gitlab.com>2019-07-03 20:02:18 +0000
commitbb868dfca2b4aae3ca559d378d1ad148817c1a4b (patch)
tree82a54cddea8cec0e667ce62c259b3dd662dc2eac
parentfb35a3b7f4250f683b6a234dd70d24aa38f229a6 (diff)
parent49b5ef5c3110ec25b65e20c75c3f98dbb2c8dfea (diff)
downloadgitlab-ce-bb868dfca2b4aae3ca559d378d1ad148817c1a4b.tar.gz
Merge branch '22991-fix-sidekiq-testing-inline' into 'master'
Change occurrence of Sidekiq::Testing.inline! Closes #22991 See merge request gitlab-org/gitlab-ce!29890
-rw-r--r--spec/migrations/backfill_store_project_full_path_in_repo_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/migrations/backfill_store_project_full_path_in_repo_spec.rb b/spec/migrations/backfill_store_project_full_path_in_repo_spec.rb
index 34f4a36d63d..65a918d5440 100644
--- a/spec/migrations/backfill_store_project_full_path_in_repo_spec.rb
+++ b/spec/migrations/backfill_store_project_full_path_in_repo_spec.rb
@@ -13,7 +13,7 @@ describe BackfillStoreProjectFullPathInRepo, :migration do
subject(:migration) { described_class.new }
around do |example|
- Sidekiq::Testing.inline! do
+ perform_enqueued_jobs do
example.run
end
end