1 files changed, 13 insertions, 1 deletions
diff --git a/spec/support/wait_for_vue_resource.rb b/spec/support/wait_for_vue_resource.rb
index 4a4e2e16ee7..3bb3d9c2e51 100644
--- a/spec/support/wait_for_vue_resource.rb
+++ b/spec/support/wait_for_vue_resource.rb
@@ -1,7 +1,19 @@
 module WaitForVueResource
   def wait_for_vue_resource(spinner: true)
     Timeout.timeout(Capybara.default_max_wait_time) do
-      loop until page.evaluate_script('window.activeVueResources').zero?
+      loop until finished_all_vue_resource_requests?
     end
   end
+
+  private
+
+  def finished_all_vue_resource_requests?
+    return true unless javascript_test?
+
+    page.evaluate_script('window.activeVueResources || 0').zero?
+  end
+
+  def javascript_test?
+    Capybara.current_driver == Capybara.javascript_driver
+  end
 end