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
a9c5b6dd
Commit
a9c5b6dd
authored
Feb 06, 2018
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix stub_remote_trace_ok/ng to 206/500
parent
6a939f64
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
spec/ee/spec/controllers/ee/projects/jobs_controller_spec.rb
spec/ee/spec/controllers/ee/projects/jobs_controller_spec.rb
+2
-2
spec/requests/api/jobs_spec.rb
spec/requests/api/jobs_spec.rb
+1
-1
No files found.
spec/ee/spec/controllers/ee/projects/jobs_controller_spec.rb
View file @
a9c5b6dd
...
@@ -19,7 +19,7 @@ describe Projects::JobsController do
...
@@ -19,7 +19,7 @@ describe Projects::JobsController do
context
'when there are no network issues'
do
context
'when there are no network issues'
do
before
do
before
do
stub_remote_trace_
ok
stub_remote_trace_
206
get_trace
get_trace
end
end
...
@@ -34,7 +34,7 @@ describe Projects::JobsController do
...
@@ -34,7 +34,7 @@ describe Projects::JobsController do
context
'when there is a network issue'
do
context
'when there is a network issue'
do
before
do
before
do
stub_remote_trace_
ng
stub_remote_trace_
500
end
end
it
'returns a trace'
do
it
'returns a trace'
do
...
...
spec/requests/api/jobs_spec.rb
View file @
a9c5b6dd
...
@@ -457,7 +457,7 @@ describe API::Jobs do
...
@@ -457,7 +457,7 @@ describe API::Jobs do
let!
(
:job
)
{
create
(
:ci_build
,
:trace_artifact
,
pipeline:
pipeline
)
}
let!
(
:job
)
{
create
(
:ci_build
,
:trace_artifact
,
pipeline:
pipeline
)
}
before
do
before
do
stub_remote_trace_
ok
stub_remote_trace_
206
allow_any_instance_of
(
JobArtifactUploader
).
to
receive
(
:file_storage?
)
{
false
}
allow_any_instance_of
(
JobArtifactUploader
).
to
receive
(
:file_storage?
)
{
false
}
allow_any_instance_of
(
JobArtifactUploader
).
to
receive
(
:url
)
{
remote_trace_url
}
allow_any_instance_of
(
JobArtifactUploader
).
to
receive
(
:url
)
{
remote_trace_url
}
allow_any_instance_of
(
JobArtifactUploader
).
to
receive
(
:size
)
{
remote_trace_size
}
allow_any_instance_of
(
JobArtifactUploader
).
to
receive
(
:size
)
{
remote_trace_size
}
...
...
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