Add latest changes from gitlab-org/gitlab@12-5-stable-ee

5 files changed, 40 insertions, 1 deletions

diff --git a/qa/qa/page/project/issue/index.rb b/qa/qa/page/project/issue/index.rb
index befee25b37a..a6ccee4353b 100644
--- a/qa/qa/page/project/issue/index.rb
+++ b/qa/qa/page/project/issue/index.rb
@@ -36,6 +36,10 @@ module QA
           def click_closed_issues_link
             click_element :closed_issues_link
           end
+
+          def has_issue?(issue)
+            has_element? :issue, issue_title: issue.to_s
+          end
         end
       end
     end
diff --git a/qa/qa/page/project/issue/show.rb b/qa/qa/page/project/issue/show.rb
index d2732eb7dd2..6ec80b7c9cc 100644
--- a/qa/qa/page/project/issue/show.rb
+++ b/qa/qa/page/project/issue/show.rb
@@ -108,6 +108,10 @@ module QA
             find_element(:more_assignees_link)
           end
 
+          def noteable_note_item
+            find_element(:noteable_note_item)
+          end
+
           def select_all_activities_filter
             select_filter_with_text('Show all activity')
           end
@@ -161,7 +165,15 @@ module QA
 
           def select_user(username)
             find("#{element_selector_css(:assignee_block)} input").set(username)
-            find('.dropdown-menu-user-link', text: "@#{username}").click
+
+            dropdown_menu_user_link_selector = '.dropdown-menu-user-link'
+            at_username = "@#{username}"
+            ten_seconds = 10
+
+            wait(reload: false, max: ten_seconds, interval: 1) do
+              has_css?(dropdown_menu_user_link_selector, wait: ten_seconds, text: at_username)
+            end
+            find(dropdown_menu_user_link_selector, text: at_username).click
           end
 
           def wait_assignees_block_finish_loading
diff --git a/qa/qa/page/project/pipeline/index.rb b/qa/qa/page/project/pipeline/index.rb
index fae7818f871..b52f3e99a36 100644
--- a/qa/qa/page/project/pipeline/index.rb
+++ b/qa/qa/page/project/pipeline/index.rb
@@ -7,6 +7,10 @@ module QA::Page
         element :pipeline_link, 'class="js-pipeline-url-link' # rubocop:disable QA/ElementWithPattern
       end
 
+      view 'app/assets/javascripts/pipelines/components/pipelines_table_row.vue' do
+        element :pipeline_commit_status
+      end
+
       def click_on_latest_pipeline
         css = '.js-pipeline-url-link'
 
@@ -16,6 +20,14 @@ module QA::Page
 
         link.click
       end
+
+      def wait_for_latest_pipeline_success
+        wait(reload: false, max: 300) do
+          within_element_by_index(:pipeline_commit_status, 0) do
+            has_text?('passed')
+          end
+        end
+      end
     end
   end
 end
diff --git a/qa/qa/page/project/settings/ci_cd.rb b/qa/qa/page/project/settings/ci_cd.rb
index 45040cf4660..46f93fad61e 100644
--- a/qa/qa/page/project/settings/ci_cd.rb
+++ b/qa/qa/page/project/settings/ci_cd.rb
@@ -35,3 +35,5 @@ module QA
     end
   end
 end
+
+QA::Page::Project::Settings::CICD.prepend_if_ee('QA::EE::Page::Project::Settings::CICD')
diff --git a/qa/qa/page/project/sub_menus/settings.rb b/qa/qa/page/project/sub_menus/settings.rb
index 1cd39fcff58..8be442ba35d 100644
--- a/qa/qa/page/project/sub_menus/settings.rb
+++ b/qa/qa/page/project/sub_menus/settings.rb
@@ -13,6 +13,7 @@ module QA
                 element :settings_item
                 element :link_members_settings
                 element :general_settings_link
+                element :integrations_settings_link
               end
             end
           end
@@ -55,6 +56,14 @@ module QA
             end
           end
 
+          def go_to_integrations_settings
+            hover_settings do
+              within_submenu do
+                click_element :integrations_settings_link
+              end
+            end
+          end
+
           private
 
           def hover_settings