1 files changed, 12 insertions, 8 deletions
diff --git a/spec/support/capybara_wait_for_all_requests.rb b/spec/support/capybara_wait_for_all_requests.rb
index 36b63619b08..6f272474cf6 100644
--- a/spec/support/capybara_wait_for_all_requests.rb
+++ b/spec/support/capybara_wait_for_all_requests.rb
@@ -9,9 +9,11 @@ module Capybara
       include CapybaraHelpers
       include WaitForRequests
 
-      def visit(visit_uri)
+      def visit(visit_uri, &block)
         super
 
+        yield if block
+
         wait_for_all_requests
       end
     end
@@ -24,24 +26,26 @@ module Capybara
       include CapybaraHelpers
       include WaitForRequests
 
-      module WaitForAllRequestsAfterClickButton
+      module WaitForRequestsAfterClickButton
         def click_button(locator = nil, **options)
           super
 
-          wait_for_all_requests
+          wait_for_requests
         end
       end
 
-      module WaitForAllRequestsAfterClickLink
-        def click_link(locator = nil, **options)
+      module WaitForRequestsAfterClickLink
+        def click_link(locator = nil, **options, &block)
           super
 
-          wait_for_all_requests
+          yield if block
+
+          wait_for_requests
         end
       end
 
-      prepend WaitForAllRequestsAfterClickButton
-      prepend WaitForAllRequestsAfterClickLink
+      prepend WaitForRequestsAfterClickButton
+      prepend WaitForRequestsAfterClickLink
     end
   end
 end