Add latest changes from gitlab-org/gitlab@master

2 files changed, 43 insertions, 23 deletions

diff --git a/spec/support_specs/capybara_wait_for_all_requests_after_page_visit_spec.rb b/spec/support_specs/capybara_wait_for_all_requests_after_page_visit_spec.rb
deleted file mode 100644
index aec67b66379..00000000000
--- a/spec/support_specs/capybara_wait_for_all_requests_after_page_visit_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'fast_spec_helper'
-require 'capybara'
-require 'support/capybara_wait_for_all_requests_after_visit_page'
-
-RSpec.describe Capybara::Session::WaitForAllRequestsAfterVisitPage, feature_category: :tooling do # rubocop:disable RSpec/FilePath
-  let(:page_visitor) do
-    Class.new do
-      def visit(visit_uri)
-        visit_uri
-      end
-
-      prepend Capybara::Session::WaitForAllRequestsAfterVisitPage
-    end.new
-  end
-
-  it 'waits for all requests after a page visit' do
-    expect(page_visitor).to receive(:wait_for_all_requests)
-
-    page_visitor.visit('http://test.com')
-  end
-end
diff --git a/spec/support_specs/capybara_wait_for_all_requests_spec.rb b/spec/support_specs/capybara_wait_for_all_requests_spec.rb
new file mode 100644
index 00000000000..fd105c3ab01
--- /dev/null
+++ b/spec/support_specs/capybara_wait_for_all_requests_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'fast_spec_helper'
+require 'capybara'
+require 'support/capybara_wait_for_all_requests'
+
+RSpec.describe 'capybara_wait_for_all_requests', feature_category: :tooling do # rubocop:disable RSpec/FilePath
+  context 'for Capybara::Session::WaitForAllRequestsAfterVisitPage' do
+    let(:page_visitor) do
+      Class.new do
+        def visit(visit_uri)
+          visit_uri
+        end
+
+        prepend Capybara::Session::WaitForAllRequestsAfterVisitPage
+      end.new
+    end
+
+    it 'waits for all requests after a page visit' do
+      expect(page_visitor).to receive(:wait_for_all_requests)
+
+      page_visitor.visit('http://test.com')
+    end
+  end
+
+  context 'for Capybara::Node::Actions::WaitForAllRequestsAfterClickButton' do
+    let(:node) do
+      Class.new do
+        def click_button(locator = nil, **_options)
+          locator
+        end
+
+        prepend Capybara::Node::Actions::WaitForAllRequestsAfterClickButton
+      end.new
+    end
+
+    it 'waits for all requests after a page visit' do
+      expect(node).to receive(:wait_for_all_requests)
+
+      node.click_button
+    end
+  end
+end