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
217c5225
Commit
217c5225
authored
Dec 21, 2017
by
Kamil Trzciński
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec failures
parent
a0b90c7f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
spec/features/projects/jobs/user_browses_job_spec.rb
spec/features/projects/jobs/user_browses_job_spec.rb
+1
-1
spec/requests/api/jobs_spec.rb
spec/requests/api/jobs_spec.rb
+2
-2
No files found.
spec/features/projects/jobs/user_browses_job_spec.rb
View file @
217c5225
require
'spec_helper'
describe
'User browses a job'
,
:js
do
let!
(
:build
)
{
create
(
:ci_build
,
:coverage
,
pipeline:
pipeline
)
}
let!
(
:build
)
{
create
(
:ci_build
,
:
running
,
:
coverage
,
pipeline:
pipeline
)
}
let
(
:pipeline
)
{
create
(
:ci_empty_pipeline
,
project:
project
,
sha:
project
.
commit
.
sha
,
ref:
'master'
)
}
let
(
:project
)
{
create
(
:project
,
:repository
,
namespace:
user
.
namespace
)
}
let
(
:user
)
{
create
(
:user
)
}
...
...
spec/requests/api/jobs_spec.rb
View file @
217c5225
...
...
@@ -11,7 +11,7 @@ describe API::Jobs do
ref:
project
.
default_branch
)
end
let!
(
:job
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
let!
(
:job
)
{
create
(
:ci_build
,
:success
,
pipeline:
pipeline
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:api_user
)
{
user
}
...
...
@@ -443,7 +443,7 @@ describe API::Jobs do
context
'user with :update_build persmission'
do
it
'cancels running or pending job'
do
expect
(
response
).
to
have_gitlab_http_status
(
201
)
expect
(
project
.
builds
.
first
.
status
).
to
eq
(
'
canceled
'
)
expect
(
project
.
builds
.
first
.
status
).
to
eq
(
'
success
'
)
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