Commit 63b93664 authored by Filipa Lacerda's avatar Filipa Lacerda

Adds information for pending state

parent 30cfcd5a
...@@ -100,8 +100,13 @@ ...@@ -100,8 +100,13 @@
illustration: 'illustrations/job_not_triggered.svg', illustration: 'illustrations/job_not_triggered.svg',
illustration_size: 'svg-306', illustration_size: 'svg-306',
title: _('This job has not been triggered yet'), 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" = render "sidebar"
.js-build-options{ data: javascript_build_options } .js-build-options{ data: javascript_build_options }
......
...@@ -388,7 +388,8 @@ feature 'Jobs' do ...@@ -388,7 +388,8 @@ feature 'Jobs' do
click_link 'Trigger this manual action' click_link 'Trigger this manual action'
wait_for_requests 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') expect(page).to have_content('pending')
end end
end end
...@@ -402,7 +403,7 @@ feature 'Jobs' do ...@@ -402,7 +403,7 @@ feature 'Jobs' do
it 'shows empty state' 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 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
end end
...@@ -413,9 +414,9 @@ feature 'Jobs' do ...@@ -413,9 +414,9 @@ feature 'Jobs' do
visit project_job_path(project, job) visit project_job_path(project, job)
end 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 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 end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment