Fix race condition with dispatcher.jsdispatcher-race-condition-fix

The dispatcher was trying to create a new instance of a class that is loaded in a file after main.js which would cause the filtered search to not work on issues. This would only happen on the first load when the JS is not cached. If the JS is cached, then everything will be fine.

1 files changed, 7 insertions, 3 deletions

diff --git a/spec/features/merge_requests/conflicts_spec.rb b/spec/features/merge_requests/conflicts_spec.rb
index 2c560632a1b..2d2c674f8fb 100644
--- a/spec/features/merge_requests/conflicts_spec.rb
+++ b/spec/features/merge_requests/conflicts_spec.rb
@@ -28,11 +28,12 @@ feature 'Merge request conflict resolution', js: true do
       end
 
       click_button 'Commit conflict resolution'
-      wait_for_requests
 
       expect(page).to have_content('All merge conflicts were resolved')
       merge_request.reload_diff
 
+      wait_for_requests
+
       click_on 'Changes'
       wait_for_requests
 
@@ -69,10 +70,12 @@ feature 'Merge request conflict resolution', js: true do
       end
 
       click_button 'Commit conflict resolution'
-      wait_for_requests
+
       expect(page).to have_content('All merge conflicts were resolved')
       merge_request.reload_diff
 
+      wait_for_requests
+
       click_on 'Changes'
       wait_for_requests
 
@@ -140,12 +143,13 @@ feature 'Merge request conflict resolution', js: true do
         end
 
         click_button 'Commit conflict resolution'
-        wait_for_requests
 
         expect(page).to have_content('All merge conflicts were resolved')
 
         merge_request.reload_diff
 
+        wait_for_requests
+
         click_on 'Changes'
         wait_for_requests
         click_link 'Expand all'