Skip to content
Snippets Groups Projects
Unverified Commit a1f7b2bc authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files

Do not render non triggered empty state for pending jobs

Put back non triggered information
parent e4952f17
No related branches found
No related tags found
No related merge requests found
- illustration = local_assigns.fetch(:illustration)
- illustration_size = local_assigns.fetch(:illustration_size)
- title = local_assigns.fetch(:title)
- content = local_assigns.fetch(:content, nil)
- content = local_assigns.fetch(:content)
- action = local_assigns.fetch(:action, nil)
 
.row.empty-state
Loading
Loading
@@ -11,8 +11,7 @@
.col-xs-12
.text-content
%h4.text-center= title
- if content
%p= content
%p= content
- if action
.text-center
= action
Loading
Loading
@@ -95,11 +95,12 @@
title: _('This job requires a manual action'),
content: _('This job depends on a user to trigger its process. Often they are used to deploy code to production environments'),
action: ( link_to _('Trigger this manual action'), play_project_job_path(@project, @build), method: :post, class: 'btn btn-primary', title: _('Trigger this manual action') )
- else
- elsif @build.created?
= render 'empty_state',
illustration: 'illustrations/job_not_triggered.svg',
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.')
 
= render "sidebar"
 
Loading
Loading
Loading
Loading
@@ -403,6 +403,20 @@ 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.')
end
end
context 'Pending job' do
let(:job) { create(:ci_build, :pending, pipeline: pipeline) }
before do
visit project_job_path(project, job)
end
it 'does not show non triggered screen' 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.')
end
end
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment