1 files changed, 7 insertions, 2 deletions
diff --git a/qa/qa/page/base.rb b/qa/qa/page/base.rb
index 42208f05c89..cb3827f8eb1 100644
--- a/qa/qa/page/base.rb
+++ b/qa/qa/page/base.rb
@@ -133,8 +133,13 @@ module QA
       end
 
       # replace with (..., page = self.class)
-      def click_element(name, page = nil, text: nil, wait: Capybara.default_max_wait_time)
-        find_element(name, text: text, wait: wait).click
+      def click_element(name, page = nil, **kwargs)
+        wait_for_requests
+
+        wait = kwargs.delete(:wait) || Capybara.default_max_wait_time
+        text = kwargs.delete(:text)
+
+        find(element_selector_css(name, kwargs), text: text, wait: wait).click
         page.validate_elements_present! if page
       end