diff options
author | Rémy Coutable <remy@rymai.me> | 2018-10-18 10:00:42 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-10-18 10:00:42 +0200 |
commit | 105a8c177f7c2bfdd670180fe57d424d2c2de152 (patch) | |
tree | ec7bee53cf41210d5c06e6a64e4140a27eb2c182 /qa | |
parent | 4ef9bb6a04b9f26d2a718dc036d7fca5dec35b05 (diff) | |
download | gitlab-ce-105a8c177f7c2bfdd670180fe57d424d2c2de152.tar.gz |
[QA] Fix the 'clone using deploy key' tests
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/page/project/job/show.rb | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/qa/qa/page/project/job/show.rb b/qa/qa/page/project/job/show.rb index 5baf6439cfc..d688f15914c 100644 --- a/qa/qa/page/project/job/show.rb +++ b/qa/qa/page/project/job/show.rb @@ -4,30 +4,39 @@ module QA::Page COMPLETED_STATUSES = %w[passed failed canceled blocked skipped manual].freeze # excludes created, pending, running PASSED_STATUS = 'passed'.freeze - view 'app/views/shared/builds/_build_output.html.haml' do - element :build_output, '.js-build-output' # rubocop:disable QA/ElementWithPattern - element :loading_animation, '.js-build-refresh' # rubocop:disable QA/ElementWithPattern + view 'app/assets/javascripts/jobs/components/job_app.vue' do + element :loading_animation + end + + view 'app/assets/javascripts/jobs/components/job_log.vue' do + element :build_trace end view 'app/assets/javascripts/vue_shared/components/ci_badge_link.vue' do - element :status_badge, 'ci-status' # rubocop:disable QA/ElementWithPattern + element :status_badge end def completed? - COMPLETED_STATUSES.include? find('.ci-status').text + COMPLETED_STATUSES.include?(status_badge) end def passed? - find('.ci-status').text == PASSED_STATUS + status_badge == PASSED_STATUS end def trace_loading? - has_css?('.js-build-refresh') + has_element?(:loading_animation) end # Reminder: You may wish to wait for a particular job status before checking output def output - find('.js-build-output').text + find_element(:build_trace).text + end + + private + + def status_badge + find_element(:status_badge).text end end end |