Merge branch '29836-try-waiting-for-ajax-in-addition-to-requests' into 'master'

Wait for AJAX requests at the JS level in addition to wait for requests at the middleware level

Closes #29836

See merge request !10688

1 files changed, 8 insertions, 1 deletions

diff --git a/features/support/env.rb b/features/support/env.rb
index 06c804b1db7..92d13bea4b6 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -10,7 +10,7 @@ if ENV['CI']
   Knapsack::Adapters::SpinachAdapter.bind
 end
 
-%w(select2_helper test_env repo_helpers wait_for_ajax sidekiq).each do |f|
+%w(select2_helper test_env repo_helpers wait_for_ajax wait_for_requests sidekiq).each do |f|
   require Rails.root.join('spec', 'support', f)
 end
 
@@ -30,6 +30,13 @@ Spinach.hooks.before_run do
   include FactoryGirl::Syntax::Methods
 end
 
+Spinach.hooks.after_feature do |feature_data|
+  if feature_data.scenarios.flat_map(&:tags).include?('javascript')
+    include WaitForRequests
+    wait_for_requests_complete
+  end
+end
+
 module StdoutReporterWithScenarioLocation
   # Override the standard reporter to show filename and line number next to each
   # scenario for easy, focused re-runs