summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 15:08:44 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 15:08:44 +0000
commit120f4aaedc8fe830a3f572491d240d8ee6addefb (patch)
treea2138baa55dfa67d292fb1a83ce686ee7f5d10a5 /qa
parent729e3765d5feb762df1ccfbc228a8dd4662aa3f9 (diff)
downloadgitlab-ce-120f4aaedc8fe830a3f572491d240d8ee6addefb.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r--qa/qa.rb2
-rw-r--r--qa/qa/page/project/pipeline/index.rb6
-rw-r--r--qa/qa/vendor/jenkins/page/configure_job.rb7
-rw-r--r--qa/qa/vendor/jenkins/page/last_job_console.rb (renamed from qa/qa/vendor/jenkins/page/job.rb)10
4 files changed, 17 insertions, 8 deletions
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/last_job_console.rb
index 498ce6041b8..4c511a8c1f8 100644
--- a/qa/qa/vendor/jenkins/page/job.rb
+++ b/qa/qa/vendor/jenkins/page/last_job_console.rb
@@ -6,15 +6,19 @@ module QA
module Vendor
module Jenkins
module Page
- class Job < Page::Base
+ class LastJobConsole < Page::Base
attr_accessor :job_name
def path
- "/job/#{@job_name}"
+ "/job/#{@job_name}/lastBuild/console"
end
def has_successful_build?
- page.has_text?("Last 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