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
63b93664
Commit
63b93664
authored
Jan 22, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds information for pending state
parent
30cfcd5a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
app/views/projects/jobs/show.html.haml
app/views/projects/jobs/show.html.haml
+7
-2
spec/features/projects/jobs_spec.rb
spec/features/projects/jobs_spec.rb
+5
-4
No files found.
app/views/projects/jobs/show.html.haml
View file @
63b93664
...
@@ -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
}
...
...
spec/features/projects/jobs_spec.rb
View file @
63b93664
...
@@ -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
...
...
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