Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
a1f7b2bc
Commit
a1f7b2bc
authored
Jan 19, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not render non triggered empty state for pending jobs
Put back non triggered information
parent
e4952f17
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
5 deletions
+19
-5
app/views/projects/jobs/_empty_state.html.haml
app/views/projects/jobs/_empty_state.html.haml
+2
-3
app/views/projects/jobs/show.html.haml
app/views/projects/jobs/show.html.haml
+3
-2
spec/features/projects/jobs_spec.rb
spec/features/projects/jobs_spec.rb
+14
-0
No files found.
app/views/projects/jobs/_empty_state.html.haml
View file @
a1f7b2bc
-
illustration
=
local_assigns
.
fetch
(
:illustration
)
-
illustration
=
local_assigns
.
fetch
(
:illustration
)
-
illustration_size
=
local_assigns
.
fetch
(
:illustration_size
)
-
illustration_size
=
local_assigns
.
fetch
(
:illustration_size
)
-
title
=
local_assigns
.
fetch
(
:title
)
-
title
=
local_assigns
.
fetch
(
:title
)
-
content
=
local_assigns
.
fetch
(
:content
,
nil
)
-
content
=
local_assigns
.
fetch
(
:content
)
-
action
=
local_assigns
.
fetch
(
:action
,
nil
)
-
action
=
local_assigns
.
fetch
(
:action
,
nil
)
.row.empty-state
.row.empty-state
...
@@ -11,8 +11,7 @@
...
@@ -11,8 +11,7 @@
.col-xs-12
.col-xs-12
.text-content
.text-content
%h4
.text-center
=
title
%h4
.text-center
=
title
-
if
content
%p
=
content
%p
=
content
-
if
action
-
if
action
.text-center
.text-center
=
action
=
action
app/views/projects/jobs/show.html.haml
View file @
a1f7b2bc
...
@@ -95,11 +95,12 @@
...
@@ -95,11 +95,12 @@
title:
_
(
'This job requires a manual action'
),
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'
),
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'
)
)
action:
(
link_to
_
(
'Trigger this manual action'
),
play_project_job_path
(
@project
,
@build
),
method: :post
,
class:
'btn btn-primary'
,
title:
_
(
'Trigger this manual action'
)
)
-
els
e
-
els
if
@build
.
created?
=
render
'empty_state'
,
=
render
'empty_state'
,
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.'
)
=
render
"sidebar"
=
render
"sidebar"
...
...
spec/features/projects/jobs_spec.rb
View file @
a1f7b2bc
...
@@ -403,6 +403,20 @@ feature 'Jobs' do
...
@@ -403,6 +403,20 @@ 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.'
)
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
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment