summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-06-19 09:13:38 +0000
committerRémy Coutable <remy@rymai.me>2018-06-19 09:13:38 +0000
commit0fcb6d3347d2976820c27254762d4d70f6836413 (patch)
tree884d1072d21e7c850ac8933dc8f9ddb84d38618b /spec
parent719e0dc39e8b333c51a7cf504ef736eb31c085cb (diff)
parentc46ff7de67d31bfc8875abf58d0fd096b6d725ae (diff)
downloadgitlab-ce-0fcb6d3347d2976820c27254762d4d70f6836413.tar.gz
Merge branch '48093-fix-flakey-notes-background-process-specs' into 'master'
Fix flakey time-sensitive notes creation specs that rely on background Sidekiq jobs Closes #48093 See merge request gitlab-org/gitlab-ce!19979
Diffstat (limited to 'spec')
-rw-r--r--spec/support/helpers/features/notes_helpers.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/helpers/features/notes_helpers.rb b/spec/support/helpers/features/notes_helpers.rb
index 1a1d5853a7a..2b9f8b30c60 100644
--- a/spec/support/helpers/features/notes_helpers.rb
+++ b/spec/support/helpers/features/notes_helpers.rb
@@ -13,7 +13,7 @@ module Spec
module Features
module NotesHelpers
def add_note(text)
- Sidekiq::Testing.fake! do
+ perform_enqueued_jobs do
page.within(".js-main-target-form") do
fill_in("note[note]", with: text)
find(".js-comment-submit-button").click