Do not render non triggered empty state for pending jobs

Put back non triggered information

3 files changed, 19 insertions, 5 deletions

diff --git a/app/views/projects/jobs/_empty_state.html.haml b/app/views/projects/jobs/_empty_state.html.haml
index 311934d9c33..c66313bdbf3 100644
--- a/app/views/projects/jobs/_empty_state.html.haml
+++ b/app/views/projects/jobs/_empty_state.html.haml
@@ -1,7 +1,7 @@
 - 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
@@ -11,8 +11,7 @@
   .col-xs-12
     .text-content
       %h4.text-center= title
-      - if content
-        %p= content
+      %p= content
       - if action
         .text-center
           = action
diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml
index 1e6d6f67e66..13a8e2c3ace 100644
--- a/app/views/projects/jobs/show.html.haml
+++ b/app/views/projects/jobs/show.html.haml
@@ -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"
 
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index a5cd858b11a..e7e2e1531a7 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -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