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
bc695e26
Unverified
Commit
bc695e26
authored
Apr 24, 2017
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix incorrect spec filenames which were ingored by CI
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
c76812c7
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
40 additions
and
47 deletions
+40
-47
builds_controller_spec.rb
spec/controllers/projects/builds_controller_spec.rb
+40
-0
builds_controller_specs.rb
spec/controllers/projects/builds_controller_specs.rb
+0
-47
create_issue_for_single_discussion_in_merge_request_spec.rb
...eate_issue_for_single_discussion_in_merge_request_spec.rb
+0
-0
user_posts_notes_spec.rb
spec/features/merge_requests/user_posts_notes_spec.rb
+0
-0
other_markup_spec.rb
spec/lib/gitlab/other_markup_spec.rb
+0
-0
No files found.
spec/controllers/projects/builds_controller_spec.rb
View file @
bc695e26
...
...
@@ -63,4 +63,44 @@ describe Projects::BuildsController do
expect
(
json_response
[
'favicon'
]).
to
eq
"/assets/ci_favicons/
#{
status
.
favicon
}
.ico"
end
end
describe
'GET trace.json'
do
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
project:
project
)
}
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
let
(
:user
)
{
create
(
:user
)
}
context
'when user is logged in as developer'
do
before
do
project
.
add_developer
(
user
)
sign_in
(
user
)
get_trace
end
it
'traces build log'
do
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
json_response
[
'id'
]).
to
eq
build
.
id
expect
(
json_response
[
'status'
]).
to
eq
build
.
status
end
end
context
'when user is logged in as non member'
do
before
do
sign_in
(
user
)
get_trace
end
it
'traces build log'
do
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
json_response
[
'id'
]).
to
eq
build
.
id
expect
(
json_response
[
'status'
]).
to
eq
build
.
status
end
end
def
get_trace
get
:trace
,
namespace_id:
project
.
namespace
,
project_id:
project
,
id:
build
.
id
,
format: :json
end
end
end
spec/controllers/projects/builds_controller_specs.rb
deleted
100644 → 0
View file @
c76812c7
require
'spec_helper'
describe
Projects
::
BuildsController
do
include
ApiHelpers
let
(
:project
)
{
create
(
:empty_project
,
:public
)
}
describe
'GET trace.json'
do
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
project:
project
)
}
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
let
(
:user
)
{
create
(
:user
)
}
context
'when user is logged in as developer'
do
before
do
project
.
add_developer
(
user
)
sign_in
(
user
)
get_trace
end
it
'traces build log'
do
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
json_response
[
'id'
]).
to
eq
build
.
id
expect
(
json_response
[
'status'
]).
to
eq
build
.
status
end
end
context
'when user is logged in as non member'
do
before
do
sign_in
(
user
)
get_trace
end
it
'traces build log'
do
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
json_response
[
'id'
]).
to
eq
build
.
id
expect
(
json_response
[
'status'
]).
to
eq
build
.
status
end
end
def
get_trace
get
:trace
,
namespace_id:
project
.
namespace
,
project_id:
project
,
id:
build
.
id
,
format: :json
end
end
end
spec/features/issues/create_issue_for_single_discussion_in_merge_request.rb
→
spec/features/issues/create_issue_for_single_discussion_in_merge_request
_spec
.rb
View file @
bc695e26
File moved
spec/features/merge_requests/user_posts_notes.rb
→
spec/features/merge_requests/user_posts_notes
_spec
.rb
View file @
bc695e26
File moved
spec/lib/gitlab/other_markup.rb
→
spec/lib/gitlab/other_markup
_spec
.rb
View file @
bc695e26
File moved
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