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
1f608ac4
Unverified
Commit
1f608ac4
authored
Jun 04, 2016
by
Tomasz Maczukin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove 'unscoped' from project builds selection
parent
9aca0a1f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
109 additions
and
5 deletions
+109
-5
artifacts_controller.rb
app/controllers/projects/artifacts_controller.rb
+1
-1
builds_controller.rb
app/controllers/projects/builds_controller.rb
+1
-1
builds_spec.rb
spec/features/builds_spec.rb
+107
-3
No files found.
app/controllers/projects/artifacts_controller.rb
View file @
1f608ac4
...
...
@@ -37,7 +37,7 @@ class Projects::ArtifactsController < Projects::ApplicationController
private
def
build
@build
||=
project
.
builds
.
unscoped
.
find_by!
(
id:
params
[
:build_id
])
@build
||=
project
.
builds
.
find_by!
(
id:
params
[
:build_id
])
end
def
artifacts_file
...
...
app/controllers/projects/builds_controller.rb
View file @
1f608ac4
...
...
@@ -81,7 +81,7 @@ class Projects::BuildsController < Projects::ApplicationController
private
def
build
@build
||=
project
.
builds
.
unscoped
.
find_by!
(
id:
params
[
:id
])
@build
||=
project
.
builds
.
find_by!
(
id:
params
[
:id
])
end
def
build_path
(
build
)
...
...
spec/features/builds_spec.rb
View file @
1f608ac4
...
...
@@ -7,6 +7,7 @@ describe "Builds" do
login_as
(
:user
)
@commit
=
FactoryGirl
.
create
:ci_commit
@build
=
FactoryGirl
.
create
:ci_build
,
commit:
@commit
@build2
=
FactoryGirl
.
create
:ci_build
@project
=
@commit
.
project
@project
.
team
<<
[
@user
,
:developer
]
end
...
...
@@ -66,13 +67,24 @@ describe "Builds" do
end
describe
"GET /:project/builds/:id"
do
context
"Build from project"
do
before
do
visit
namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build
)
end
it
{
expect
(
page
.
status_code
).
to
eq
(
200
)
}
it
{
expect
(
page
).
to
have_content
@commit
.
sha
[
0
..
7
]
}
it
{
expect
(
page
).
to
have_content
@commit
.
git_commit_message
}
it
{
expect
(
page
).
to
have_content
@commit
.
git_author_name
}
end
context
"Build from other project"
do
before
do
visit
namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build2
)
end
it
{
expect
(
page
.
status_code
).
to
eq
(
404
)
}
end
context
"Download artifacts"
do
before
do
...
...
@@ -103,51 +115,143 @@ describe "Builds" do
end
describe
"POST /:project/builds/:id/cancel"
do
context
"Build from project"
do
before
do
@build
.
run!
visit
namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build
)
click_link
"Cancel"
end
it
{
expect
(
page
.
status_code
).
to
eq
(
200
)
}
it
{
expect
(
page
).
to
have_content
'canceled'
}
it
{
expect
(
page
).
to
have_content
'Retry'
}
end
context
"Build from other project"
do
before
do
@build
.
run!
visit
namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build
)
page
.
driver
.
post
(
cancel_namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build2
))
end
it
{
expect
(
page
.
status_code
).
to
eq
(
404
)
}
end
end
describe
"POST /:project/builds/:id/retry"
do
context
"Build from project"
do
before
do
@build
.
run!
visit
namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build
)
click_link
"Cancel"
click_link
'Cancel'
click_link
'Retry'
end
it
{
expect
(
page
.
status_code
).
to
eq
(
200
)
}
it
{
expect
(
page
).
to
have_content
'pending'
}
it
{
expect
(
page
).
to
have_content
'Cancel'
}
end
context
"Build from other project"
do
before
do
@build
.
run!
visit
namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build
)
click_link
'Cancel'
page
.
driver
.
post
(
retry_namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build2
))
end
it
{
expect
(
page
.
status_code
).
to
eq
(
404
)
}
end
end
describe
"GET /:project/builds/:id/download"
do
context
"Build from project"
do
before
do
@build
.
update_attributes
(
artifacts_file:
artifacts_file
)
visit
namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build
)
page
.
within
(
'.artifacts'
)
{
click_link
'Download'
}
end
it
{
expect
(
page
.
status_code
).
to
eq
(
200
)
}
it
{
expect
(
page
.
response_headers
[
'Content-Type'
]).
to
eq
(
artifacts_file
.
content_type
)
}
end
context
"Build from other project"
do
before
do
@build2
.
update_attributes
(
artifacts_file:
artifacts_file
)
visit
download_namespace_project_build_artifacts_path
(
@project
.
namespace
,
@project
,
@build2
)
end
it
{
expect
(
page
.
status_code
).
to
eq
(
404
)
}
end
end
describe
"GET /:project/builds/:id/raw"
do
context
"Build from project"
do
before
do
Capybara
.
current_session
.
driver
.
header
(
'X-Sendfile-Type'
,
'X-Sendfile'
)
@build
.
run!
@build
.
trace
=
'BUILD TRACE'
visit
namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build
)
page
.
within
(
'.build-controls'
)
{
click_link
'Raw'
}
end
it
'sends the right headers'
do
page
.
within
(
'.build-controls'
)
{
click_link
'Raw'
}
expect
(
page
.
status_code
).
to
eq
(
200
)
expect
(
page
.
response_headers
[
'Content-Type'
]).
to
eq
(
'text/plain; charset=utf-8'
)
expect
(
page
.
response_headers
[
'X-Sendfile'
]).
to
eq
(
@build
.
path_to_trace
)
end
end
context
"Build from other project"
do
before
do
Capybara
.
current_session
.
driver
.
header
(
'X-Sendfile-Type'
,
'X-Sendfile'
)
@build2
.
run!
@build2
.
trace
=
'BUILD TRACE'
visit
raw_namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build2
)
puts
page
.
status_code
puts
current_url
end
it
'sends the right headers'
do
expect
(
page
.
status_code
).
to
eq
(
404
)
end
end
end
describe
"GET /:project/builds/:id/trace.json"
do
context
"Build from project"
do
before
do
visit
trace_namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build
,
format: :json
)
end
it
{
expect
(
page
.
status_code
).
to
eq
(
200
)
}
end
context
"Build from other project"
do
before
do
visit
trace_namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build2
,
format: :json
)
end
it
{
expect
(
page
.
status_code
).
to
eq
(
404
)
}
end
end
describe
"GET /:project/builds/:id/status"
do
context
"Build from project"
do
before
do
visit
status_namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build
)
end
it
{
expect
(
page
.
status_code
).
to
eq
(
200
)
}
end
context
"Build from other project"
do
before
do
visit
status_namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build2
)
end
it
{
expect
(
page
.
status_code
).
to
eq
(
404
)
}
end
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