BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
c414ab84
Unverified
Commit
c414ab84
authored
Jan 22, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve copy for the pending state
parent
4b8004c7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
show.html.haml
app/views/projects/jobs/show.html.haml
+1
-1
jobs_spec.rb
spec/features/projects/jobs_spec.rb
+2
-2
No files found.
app/views/projects/jobs/show.html.haml
View file @
c414ab84
...
@@ -106,7 +106,7 @@
...
@@ -106,7 +106,7 @@
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 started yet'
),
title:
_
(
'This job has not started yet'
),
content:
_
(
'This job is in pending state and is waiting to be picked by
the
runner'
)
content:
_
(
'This job is in pending state and is waiting to be picked by
a
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 @
c414ab84
...
@@ -389,7 +389,7 @@ feature 'Jobs' do
...
@@ -389,7 +389,7 @@ feature 'Jobs' do
wait_for_requests
wait_for_requests
expect
(
page
).
to
have_content
(
'This job has not started yet'
)
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
(
'This job is in pending state and is waiting to be picked by
a
runner'
)
expect
(
page
).
to
have_content
(
'pending'
)
expect
(
page
).
to
have_content
(
'pending'
)
end
end
end
end
...
@@ -416,7 +416,7 @@ feature 'Jobs' do
...
@@ -416,7 +416,7 @@ feature 'Jobs' do
it
'shows pending empty state'
do
it
'shows pending empty state'
do
expect
(
page
).
to
have_content
(
'This job has not started yet'
)
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
(
'This job is in pending state and is waiting to be picked by
a
runner'
)
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