diff options
| -rw-r--r-- | app/views/projects/jobs/show.html.haml | 9 | ||||
| -rw-r--r-- | spec/features/projects/jobs_spec.rb | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml index 13a8e2c3ace..06b5a1e7d0c 100644 --- a/app/views/projects/jobs/show.html.haml +++ b/app/views/projects/jobs/show.html.haml @@ -100,8 +100,13 @@ illustration: 'illustrations/job_not_triggered.svg', illustration_size: 'svg-306', title: _('This job has not been triggered yet'), - content: _('This job depends on upstream jobs that need to succeed in order for this job to be triggered.') - + content: _('This job depends on upstream jobs that need to succeed in order for this job to be triggered') + - else + = render 'empty_state', + illustration: 'illustrations/job_not_triggered.svg', + illustration_size: 'svg-306', + title: _('This job has not started yet'), + content: _('This job is in pending state and is waiting to be picked by the runner') = render "sidebar" .js-build-options{ data: javascript_build_options } diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb index 6a243dba8ff..e4fca521f94 100644 --- a/spec/features/projects/jobs_spec.rb +++ b/spec/features/projects/jobs_spec.rb @@ -388,7 +388,8 @@ feature 'Jobs' do click_link 'Trigger this manual action' wait_for_requests - expect(page).to have_content('This job is stuck, because the project doesn\'t have any runners online assigned to it.') + expect(page).to have_content('This job has not started yet') + expect(page).to have_content('This job is in pending state and is waiting to be picked by the runner') expect(page).to have_content('pending') end end @@ -402,7 +403,7 @@ feature 'Jobs' do it 'shows empty state' do expect(page).to have_content('This job has not been triggered yet') - expect(page).to have_content('This job depends on upstream jobs that need to succeed in order for this job to be triggered.') + expect(page).to have_content('This job depends on upstream jobs that need to succeed in order for this job to be triggered') end end @@ -413,9 +414,9 @@ feature 'Jobs' do visit project_job_path(project, job) end - it 'does not show non triggered screen' do + it 'shows pending empty state' do expect(page).not_to have_content('This job has not been triggered yet') - expect(page).not_to have_content('This job depends on upstream jobs that need to succeed in order for this job to be triggered.') + expect(page).not_to have_content('This job depends on upstream jobs that need to succeed in order for this job to be triggered') end end end |