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
73ac7b2d
Commit
73ac7b2d
authored
Apr 28, 2017
by
Dosuken shinya
Committed by
Rémy Coutable
Apr 28, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb"
parent
00fd0259
Changes
10
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
496 additions
and
20 deletions
+496
-20
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+4
-0
app/controllers/projects/builds_controller.rb
app/controllers/projects/builds_controller.rb
+10
-5
changelogs/unreleased/29181-add-more-tests-for-spec-controllers-projects-builds-controller-spec-rb.yml
...r-spec-controllers-projects-builds-controller-spec-rb.yml
+4
-0
config/routes/project.rb
config/routes/project.rb
+1
-1
spec/controllers/projects/builds_controller_spec.rb
spec/controllers/projects/builds_controller_spec.rb
+354
-12
spec/factories/ci/builds.rb
spec/factories/ci/builds.rb
+13
-0
spec/features/security/project/internal_access_spec.rb
spec/features/security/project/internal_access_spec.rb
+38
-0
spec/features/security/project/private_access_spec.rb
spec/features/security/project/private_access_spec.rb
+32
-0
spec/features/security/project/public_access_spec.rb
spec/features/security/project/public_access_spec.rb
+38
-0
spec/support/matchers/access_matchers.rb
spec/support/matchers/access_matchers.rb
+2
-2
No files found.
app/controllers/application_controller.rb
View file @
73ac7b2d
...
@@ -118,6 +118,10 @@ class ApplicationController < ActionController::Base
...
@@ -118,6 +118,10 @@ class ApplicationController < ActionController::Base
end
end
end
end
def
respond_422
head
:unprocessable_entity
end
def
no_cache_headers
def
no_cache_headers
response
.
headers
[
"Cache-Control"
]
=
"no-cache, no-store, max-age=0, must-revalidate"
response
.
headers
[
"Cache-Control"
]
=
"no-cache, no-store, max-age=0, must-revalidate"
response
.
headers
[
"Pragma"
]
=
"no-cache"
response
.
headers
[
"Pragma"
]
=
"no-cache"
...
...
app/controllers/projects/builds_controller.rb
View file @
73ac7b2d
class
Projects::BuildsController
<
Projects
::
ApplicationController
class
Projects::BuildsController
<
Projects
::
ApplicationController
before_action
:build
,
except:
[
:index
,
:cancel_all
]
before_action
:build
,
except:
[
:index
,
:cancel_all
]
before_action
:authorize_read_build!
,
except:
[
:cancel
,
:cancel_all
,
:retry
,
:play
]
before_action
:authorize_read_build!
,
only:
[
:index
,
:show
,
:status
,
:raw
,
:trace
]
before_action
:authorize_update_build!
,
except:
[
:index
,
:show
,
:status
,
:raw
,
:trace
]
before_action
:authorize_update_build!
,
except:
[
:index
,
:show
,
:status
,
:raw
,
:trace
]
layout
'project'
layout
'project'
...
@@ -60,20 +60,22 @@ class Projects::BuildsController < Projects::ApplicationController
...
@@ -60,20 +60,22 @@ class Projects::BuildsController < Projects::ApplicationController
end
end
def
retry
def
retry
return
re
nder_404
unless
@build
.
retryable?
return
re
spond_422
unless
@build
.
retryable?
build
=
Ci
::
Build
.
retry
(
@build
,
current_user
)
build
=
Ci
::
Build
.
retry
(
@build
,
current_user
)
redirect_to
build_path
(
build
)
redirect_to
build_path
(
build
)
end
end
def
play
def
play
return
re
nder_404
unless
@build
.
playable?
return
re
spond_422
unless
@build
.
playable?
build
=
@build
.
play
(
current_user
)
build
=
@build
.
play
(
current_user
)
redirect_to
build_path
(
build
)
redirect_to
build_path
(
build
)
end
end
def
cancel
def
cancel
return
respond_422
unless
@build
.
cancelable?
@build
.
cancel
@build
.
cancel
redirect_to
build_path
(
@build
)
redirect_to
build_path
(
@build
)
end
end
...
@@ -85,9 +87,12 @@ class Projects::BuildsController < Projects::ApplicationController
...
@@ -85,9 +87,12 @@ class Projects::BuildsController < Projects::ApplicationController
end
end
def
erase
def
erase
@build
.
erase
(
erased_by:
current_user
)
if
@build
.
erase
(
erased_by:
current_user
)
redirect_to
namespace_project_build_path
(
project
.
namespace
,
project
,
@build
),
redirect_to
namespace_project_build_path
(
project
.
namespace
,
project
,
@build
),
notice:
"Build has been successfully erased!"
notice:
"Build has been successfully erased!"
else
respond_422
end
end
end
def
raw
def
raw
...
...
changelogs/unreleased/29181-add-more-tests-for-spec-controllers-projects-builds-controller-spec-rb.yml
0 → 100644
View file @
73ac7b2d
---
title
:
Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb"
merge_request
:
10244
author
:
dosuken123
config/routes/project.rb
View file @
73ac7b2d
...
@@ -173,7 +173,7 @@ constraints(ProjectUrlConstrainer.new) do
...
@@ -173,7 +173,7 @@ constraints(ProjectUrlConstrainer.new) do
post
:retry
post
:retry
post
:play
post
:play
post
:erase
post
:erase
get
:trace
get
:trace
,
defaults:
{
format:
'json'
}
get
:raw
get
:raw
end
end
...
...
spec/controllers/projects/builds_controller_spec.rb
View file @
73ac7b2d
This diff is collapsed.
Click to expand it.
spec/factories/ci/builds.rb
View file @
73ac7b2d
...
@@ -79,6 +79,19 @@ FactoryGirl.define do
...
@@ -79,6 +79,19 @@ FactoryGirl.define do
manual
manual
end
end
trait
:retryable
do
success
end
trait
:cancelable
do
pending
end
trait
:erasable
do
success
artifacts
end
trait
:tags
do
trait
:tags
do
tag_list
[
:docker
,
:ruby
]
tag_list
[
:docker
,
:ruby
]
end
end
...
...
spec/features/security/project/internal_access_spec.rb
View file @
73ac7b2d
...
@@ -399,6 +399,44 @@ describe "Internal Project Access", feature: true do
...
@@ -399,6 +399,44 @@ describe "Internal Project Access", feature: true do
end
end
end
end
describe
'GET /:project_path/builds/:id/trace'
do
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
project:
project
)
}
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
subject
{
trace_namespace_project_build_path
(
project
.
namespace
,
project
,
build
.
id
)
}
context
'when allowed for public and internal'
do
before
do
project
.
update
(
public_builds:
true
)
end
it
{
is_expected
.
to
be_allowed_for
(
:admin
)
}
it
{
is_expected
.
to
be_allowed_for
(
:owner
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:master
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:developer
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:reporter
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:guest
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:user
)
}
it
{
is_expected
.
to
be_denied_for
(
:external
)
}
it
{
is_expected
.
to
be_denied_for
(
:visitor
)
}
end
context
'when disallowed for public and internal'
do
before
do
project
.
update
(
public_builds:
false
)
end
it
{
is_expected
.
to
be_allowed_for
(
:admin
)
}
it
{
is_expected
.
to
be_allowed_for
(
:owner
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:master
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:developer
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:reporter
).
of
(
project
)
}
it
{
is_expected
.
to
be_denied_for
(
:guest
).
of
(
project
)
}
it
{
is_expected
.
to
be_denied_for
(
:user
)
}
it
{
is_expected
.
to
be_denied_for
(
:external
)
}
it
{
is_expected
.
to
be_denied_for
(
:visitor
)
}
end
end
describe
"GET /:project_path/environments"
do
describe
"GET /:project_path/environments"
do
subject
{
namespace_project_environments_path
(
project
.
namespace
,
project
)
}
subject
{
namespace_project_environments_path
(
project
.
namespace
,
project
)
}
...
...
spec/features/security/project/private_access_spec.rb
View file @
73ac7b2d
...
@@ -388,6 +388,38 @@ describe "Private Project Access", feature: true do
...
@@ -388,6 +388,38 @@ describe "Private Project Access", feature: true do
end
end
end
end
describe
'GET /:project_path/builds/:id/trace'
do
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
project:
project
)
}
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
subject
{
trace_namespace_project_build_path
(
project
.
namespace
,
project
,
build
.
id
)
}
it
{
is_expected
.
to
be_allowed_for
(
:admin
)
}
it
{
is_expected
.
to
be_allowed_for
(
:owner
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:master
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:developer
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:reporter
).
of
(
project
)
}
it
{
is_expected
.
to
be_denied_for
(
:guest
).
of
(
project
)
}
it
{
is_expected
.
to
be_denied_for
(
:user
)
}
it
{
is_expected
.
to
be_denied_for
(
:external
)
}
it
{
is_expected
.
to
be_denied_for
(
:visitor
)
}
context
'when public builds is enabled'
do
before
do
project
.
update
(
public_builds:
true
)
end
it
{
is_expected
.
to
be_allowed_for
(
:guest
).
of
(
project
)
}
end
context
'when public builds is disabled'
do
before
do
project
.
update
(
public_builds:
false
)
end
it
{
is_expected
.
to
be_denied_for
(
:guest
).
of
(
project
)
}
end
end
describe
"GET /:project_path/environments"
do
describe
"GET /:project_path/environments"
do
subject
{
namespace_project_environments_path
(
project
.
namespace
,
project
)
}
subject
{
namespace_project_environments_path
(
project
.
namespace
,
project
)
}
...
...
spec/features/security/project/public_access_spec.rb
View file @
73ac7b2d
...
@@ -219,6 +219,44 @@ describe "Public Project Access", feature: true do
...
@@ -219,6 +219,44 @@ describe "Public Project Access", feature: true do
end
end
end
end
describe
'GET /:project_path/builds/:id/trace'
do
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
project:
project
)
}
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
subject
{
trace_namespace_project_build_path
(
project
.
namespace
,
project
,
build
.
id
)
}
context
'when allowed for public'
do
before
do
project
.
update
(
public_builds:
true
)
end
it
{
is_expected
.
to
be_allowed_for
(
:admin
)
}
it
{
is_expected
.
to
be_allowed_for
(
:owner
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:master
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:developer
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:reporter
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:guest
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:user
)
}
it
{
is_expected
.
to
be_allowed_for
(
:external
)
}
it
{
is_expected
.
to
be_allowed_for
(
:visitor
)
}
end
context
'when disallowed for public'
do
before
do
project
.
update
(
public_builds:
false
)
end
it
{
is_expected
.
to
be_allowed_for
(
:admin
)
}
it
{
is_expected
.
to
be_allowed_for
(
:owner
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:master
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:developer
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:reporter
).
of
(
project
)
}
it
{
is_expected
.
to
be_denied_for
(
:guest
).
of
(
project
)
}
it
{
is_expected
.
to
be_denied_for
(
:user
)
}
it
{
is_expected
.
to
be_denied_for
(
:external
)
}
it
{
is_expected
.
to
be_denied_for
(
:visitor
)
}
end
end
describe
"GET /:project_path/environments"
do
describe
"GET /:project_path/environments"
do
subject
{
namespace_project_environments_path
(
project
.
namespace
,
project
)
}
subject
{
namespace_project_environments_path
(
project
.
namespace
,
project
)
}
...
...
spec/support/matchers/access_matchers.rb
View file @
73ac7b2d
...
@@ -51,7 +51,7 @@ module AccessMatchers
...
@@ -51,7 +51,7 @@ module AccessMatchers
emulate_user
(
user
,
@membership
)
emulate_user
(
user
,
@membership
)
visit
(
url
)
visit
(
url
)
status_code
!=
404
&&
current_path
!=
new_user_session_path
status_code
==
200
&&
current_path
!=
new_user_session_path
end
end
chain
:of
do
|
membership
|
chain
:of
do
|
membership
|
...
@@ -66,7 +66,7 @@ module AccessMatchers
...
@@ -66,7 +66,7 @@ module AccessMatchers
emulate_user
(
user
,
@membership
)
emulate_user
(
user
,
@membership
)
visit
(
url
)
visit
(
url
)
status_code
==
404
||
current_path
==
new_user_session_path
[
401
,
404
].
include?
(
status_code
)
||
current_path
==
new_user_session_path
end
end
chain
:of
do
|
membership
|
chain
:of
do
|
membership
|
...
...
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