From 120f4aaedc8fe830a3f572491d240d8ee6addefb Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 24 Mar 2020 15:08:44 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 qa/qa.rb                                      |  2 +-
 qa/qa/page/project/pipeline/index.rb          |  6 ++----
 qa/qa/vendor/jenkins/page/configure_job.rb    |  7 +++++++
 qa/qa/vendor/jenkins/page/job.rb              | 23 -----------------------
 qa/qa/vendor/jenkins/page/last_job_console.rb | 27 +++++++++++++++++++++++++++
 5 files changed, 37 insertions(+), 28 deletions(-)
 delete mode 100644 qa/qa/vendor/jenkins/page/job.rb
 create mode 100644 qa/qa/vendor/jenkins/page/last_job_console.rb

(limited to 'qa')

diff --git a/qa/qa.rb b/qa/qa.rb
index 547b8fb94af..2cf6e02c2aa 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -478,7 +478,7 @@ module QA
         autoload :Configure, 'qa/vendor/jenkins/page/configure'
         autoload :NewCredentials, 'qa/vendor/jenkins/page/new_credentials'
         autoload :NewJob, 'qa/vendor/jenkins/page/new_job'
-        autoload :Job, 'qa/vendor/jenkins/page/job'
+        autoload :LastJobConsole, 'qa/vendor/jenkins/page/last_job_console'
         autoload :ConfigureJob, 'qa/vendor/jenkins/page/configure_job'
       end
     end
diff --git a/qa/qa/page/project/pipeline/index.rb b/qa/qa/page/project/pipeline/index.rb
index f018e4bf018..f9332e0a853 100644
--- a/qa/qa/page/project/pipeline/index.rb
+++ b/qa/qa/page/project/pipeline/index.rb
@@ -4,7 +4,7 @@ module QA::Page
   module Project::Pipeline
     class Index < QA::Page::Base
       view 'app/assets/javascripts/pipelines/components/pipeline_url.vue' do
-        element :pipeline_link, 'class="js-pipeline-url-link' # rubocop:disable QA/ElementWithPattern
+        element :pipeline_url_link
       end
 
       view 'app/assets/javascripts/pipelines/components/pipelines_table_row.vue' do
@@ -13,9 +13,7 @@ module QA::Page
       end
 
       def click_on_latest_pipeline
-        css = '.js-pipeline-url-link'
-
-        first(css, wait: 60).click
+        all_elements(:pipeline_url_link, minimum: 1, wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME).first.click
       end
 
       def wait_for_latest_pipeline_success
diff --git a/qa/qa/vendor/jenkins/page/configure_job.rb b/qa/qa/vendor/jenkins/page/configure_job.rb
index ab16e895fa9..56a2602a003 100644
--- a/qa/qa/vendor/jenkins/page/configure_job.rb
+++ b/qa/qa/vendor/jenkins/page/configure_job.rb
@@ -18,6 +18,7 @@ module QA
             click_build_when_change_is_pushed_to_gitlab
             set_publish_status_to_gitlab
             click_save
+            wait_for_configuration_to_save
           end
 
           private
@@ -55,6 +56,12 @@ module QA
           def select_publish_build_status_to_gitlab
             click_link "Publish build status to GitLab"
           end
+
+          def wait_for_configuration_to_save
+            QA::Support::Waiter.wait_until(sleep_interval: 1.0) do
+              !page.current_url.include?(@path)
+            end
+          end
         end
       end
     end
diff --git a/qa/qa/vendor/jenkins/page/job.rb b/qa/qa/vendor/jenkins/page/job.rb
deleted file mode 100644
index 498ce6041b8..00000000000
--- a/qa/qa/vendor/jenkins/page/job.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'capybara/dsl'
-
-module QA
-  module Vendor
-    module Jenkins
-      module Page
-        class Job < Page::Base
-          attr_accessor :job_name
-
-          def path
-            "/job/#{@job_name}"
-          end
-
-          def has_successful_build?
-            page.has_text?("Last successful build")
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/qa/qa/vendor/jenkins/page/last_job_console.rb b/qa/qa/vendor/jenkins/page/last_job_console.rb
new file mode 100644
index 00000000000..4c511a8c1f8
--- /dev/null
+++ b/qa/qa/vendor/jenkins/page/last_job_console.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'capybara/dsl'
+
+module QA
+  module Vendor
+    module Jenkins
+      module Page
+        class LastJobConsole < Page::Base
+          attr_accessor :job_name
+
+          def path
+            "/job/#{@job_name}/lastBuild/console"
+          end
+
+          def has_successful_build?
+            page.has_text?('Finished: SUCCESS')
+          end
+
+          def no_failed_status_update?
+            page.has_no_text?('Failed to update Gitlab commit status')
+          end
+        end
+      end
+    end
+  end
+end
-- 
cgit v1.2.3