Add latest changes from gitlab-org/gitlab@master

4 files changed, 6 insertions, 9 deletions

diff --git a/qa/qa/page/base.rb b/qa/qa/page/base.rb
index fc460f41a36..22b0021ea77 100644
--- a/qa/qa/page/base.rb
+++ b/qa/qa/page/base.rb
@@ -255,12 +255,6 @@ module QA
         click_link text
       end
 
-      def click_body
-        wait_for_requests
-
-        find('body').click
-      end
-
       def visit_link_in_element(name)
         visit find_element(name)['href']
       end
diff --git a/qa/qa/page/component/select2.rb b/qa/qa/page/component/select2.rb
index 1dd718a1d88..e667fad1dd3 100644
--- a/qa/qa/page/component/select2.rb
+++ b/qa/qa/page/component/select2.rb
@@ -34,6 +34,10 @@ module QA
           has_css?('.select2-active', wait: 1)
           has_no_css?('.select2-active', wait: 30)
         end
+
+        def dropdown_open?
+          has_css?('.select2-input')
+        end
       end
     end
   end
diff --git a/qa/qa/page/project/issue/show.rb b/qa/qa/page/project/issue/show.rb
index a1e1bb4bc98..a56083ea25c 100644
--- a/qa/qa/page/project/issue/show.rb
+++ b/qa/qa/page/project/issue/show.rb
@@ -124,7 +124,7 @@ module QA
               end
             end
 
-            click_body
+            click_element(:edit_link_labels)
 
             labels.each do |label|
               has_element?(:labels_block, text: label)
diff --git a/qa/qa/page/project/new.rb b/qa/qa/page/project/new.rb
index d0e8011d82d..97214e22820 100644
--- a/qa/qa/page/project/new.rb
+++ b/qa/qa/page/project/new.rb
@@ -32,8 +32,7 @@ module QA
 
         def choose_namespace(namespace)
           retry_on_exception do
-            click_body
-            click_element :project_namespace_select
+            click_element :project_namespace_select unless dropdown_open?
             search_and_select(namespace)
           end
         end