Merge branch 'qa/mk-fix-element-is-not-clickable-at-point' into 'master'

[CE backport] Fix intermittent QA error -- Expand button not bound to JS

See merge request gitlab-org/gitlab-ce!16737

qa/qa/page/base.rb

@@ -13,16 +13,18 @@ module QA
         visit current_url
       end
 
-      def wait(css = '.application', time: 60)
-        Time.now.tap do |start|
-          while Time.now - start < time
-            break if page.has_css?(css, wait: 5)
+      def wait(max: 60, time: 1, reload: true)
+        start = Time.now
 
-            refresh
-          end
+        while Time.now - start < max
+          return true if yield
+
+          sleep(time)
+
+          refresh if reload
         end
 
-        yield if block_given?
+        false
       end
 
       def scroll_to(selector, text: nil)

qa/qa/page/main/login.rb

@@ -10,12 +10,14 @@ module QA
 
         view 'app/views/devise/sessions/_new_base.html.haml' do
           element :login_field, 'text_field :login'
-          element :passowrd_field, 'password_field :password'
+          element :password_field, 'password_field :password'
           element :sign_in_button, 'submit "Sign in"'
         end
 
         def initialize
-          wait('.application', time: 500)
+          wait(max: 500) do
+            page.has_css?('.application')
+          end
         end
 
         def sign_in_using_credentials

qa/qa/page/project/settings/common.rb

@@ -17,8 +17,13 @@ module QA
           def expand_section(name)
             page.within('#content-body') do
               page.within('section', text: name) do
+                # Because it is possible to click the button before the JS toggle code is bound
+                wait(reload: false) do
                   click_button 'Expand' unless first('button', text: 'Collapse')
 
+                  page.has_content?('Collapse')
+                end
+
                 yield if block_given?
               end
             end