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
0e4c0e78
Commit
0e4c0e78
authored
Aug 23, 2016
by
Katarzyna Kobierska
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubocop tests
parent
895ca3a7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
lib/ci/api/lint.rb
lib/ci/api/lint.rb
+1
-2
spec/requests/ci/api/lint_spec.rb
spec/requests/ci/api/lint_spec.rb
+1
-1
No files found.
lib/ci/api/lint.rb
View file @
0e4c0e78
...
@@ -4,7 +4,6 @@ module Ci
...
@@ -4,7 +4,6 @@ module Ci
before
{
authenticate!
}
before
{
authenticate!
}
resources
:lint
do
resources
:lint
do
post
do
post
do
begin
begin
response
=
{}
response
=
{}
...
@@ -20,7 +19,7 @@ module Ci
...
@@ -20,7 +19,7 @@ module Ci
status:
"syntax is correct"
status:
"syntax is correct"
}
}
stage_builds
=
@stages
.
each
do
|
stage
|
@stages
.
each
do
|
stage
|
response
[
"
#{
stage
}
"
]
=
@builds
.
select
{
|
build
|
build
[
:stage
]
==
stage
}
response
[
"
#{
stage
}
"
]
=
@builds
.
select
{
|
build
|
build
[
:stage
]
==
stage
}
end
end
else
else
...
...
spec/requests/ci/api/lint_spec.rb
View file @
0e4c0e78
...
@@ -31,7 +31,7 @@ describe Ci::API::API do
...
@@ -31,7 +31,7 @@ describe Ci::API::API do
context
"with invalid .gitlab_ci.yml content"
do
context
"with invalid .gitlab_ci.yml content"
do
it
"validate content"
do
it
"validate content"
do
post
ci_api
(
'/lint'
),
{
private_token:
user
.
private_token
,
content:
'invalid content'
}
post
ci_api
(
'/lint'
),
{
private_token:
user
.
private_token
,
content:
'invalid content'
}
expect
(
response
).
to
have_http_status
(
500
)
expect
(
response
).
to
have_http_status
(
500
)
expect
(
json_response
[
'status'
]).
to
eq
(
'syntax is incorrect'
)
expect
(
json_response
[
'status'
]).
to
eq
(
'syntax is incorrect'
)
...
...
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