kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Adds information for pending state

This commit is contained in:
Filipa Lacerda 2018-01-22 10:10:57 +00:00
parent 30cfcd5a93
commit 63b93664c7
No known key found for this signature in database
GPG Key ID: 9CA3FDE4D1E2F1C8
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/views/projects/jobs/show.html.haml
View File

@ -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 }

9
spec/features/projects/jobs_spec.rb
View File

@ -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