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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
41c719bc
Commit
41c719bc
authored
Sep 30, 2019
by
Kamil Trzciński
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests
parent
11ee48f3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
lib/gitlab/ci/status/composite.rb
lib/gitlab/ci/status/composite.rb
+1
-1
spec/features/projects/jobs/user_browses_job_spec.rb
spec/features/projects/jobs/user_browses_job_spec.rb
+5
-5
No files found.
lib/gitlab/ci/status/composite.rb
View file @
41c719bc
...
@@ -83,7 +83,7 @@ module Gitlab
...
@@ -83,7 +83,7 @@ module Gitlab
columns
[
@allow_failure_key
]
=
:allow_failure
if
@allow_failure_key
columns
[
@allow_failure_key
]
=
:allow_failure
if
@allow_failure_key
all_statuses
all_statuses
.
pluck
(
*
columns
)
.
pluck
(
*
columns
)
# rubocop: disable CodeReuse/ActiveRecord
.
each
(
&
method
(
:consume_status
))
.
each
(
&
method
(
:consume_status
))
end
end
...
...
spec/features/projects/jobs/user_browses_job_spec.rb
View file @
41c719bc
...
@@ -104,20 +104,20 @@ describe 'User browses a job', :js do
...
@@ -104,20 +104,20 @@ describe 'User browses a job', :js do
it
'displays the failure reason'
do
it
'displays the failure reason'
do
wait_for_all_requests
wait_for_all_requests
within
(
'.builds-container'
)
do
within
(
'.builds-container'
)
do
build_link
=
first
(
'.build-job > a'
)
expect
(
page
).
to
have_selector
(
expect
(
build_link
[
'data-original-title'
]).
to
eq
(
'test - failed - (unknown failure)'
)
".build-job > a[data-original-title='test - failed - (unknown failure)']"
)
end
end
end
end
end
end
context
'when a failed job has been retried'
do
context
'when a failed job has been retried'
do
let!
(
:build
)
{
create
(
:ci_build
,
:failed
,
:retried
,
:trace_artifact
,
pipeline:
pipeline
)
}
let!
(
:build
_retried
)
{
create
(
:ci_build
,
:failed
,
:retried
,
:trace_artifact
,
pipeline:
pipeline
)
}
it
'displays the failure reason and retried label'
do
it
'displays the failure reason and retried label'
do
wait_for_all_requests
wait_for_all_requests
within
(
'.builds-container'
)
do
within
(
'.builds-container'
)
do
build_link
=
first
(
'.build-job > a'
)
expect
(
page
).
to
have_selector
(
expect
(
build_link
[
'data-original-title'
]).
to
eq
(
'test - failed - (unknown failure) (retried)'
)
".build-job > a[data-original-title='test - failed - (unknown failure) (retried)']"
)
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