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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
bf6d6948
Commit
bf6d6948
authored
Feb 04, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extract shared context level up in build specs
Also improve performance of specs by joining some of examples.
parent
53c917a6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
56 deletions
+17
-56
spec/requests/ci/api/builds_spec.rb
spec/requests/ci/api/builds_spec.rb
+17
-56
No files found.
spec/requests/ci/api/builds_spec.rb
View file @
bf6d6948
...
@@ -160,12 +160,10 @@ describe Ci::API::API do
...
@@ -160,12 +160,10 @@ describe Ci::API::API do
let
(
:headers
)
{
{
"GitLab-Workhorse"
=>
"1.0"
}
}
let
(
:headers
)
{
{
"GitLab-Workhorse"
=>
"1.0"
}
}
let
(
:headers_with_token
)
{
headers
.
merge
(
Ci
::
API
::
Helpers
::
BUILD_TOKEN_HEADER
=>
build
.
token
)
}
let
(
:headers_with_token
)
{
headers
.
merge
(
Ci
::
API
::
Helpers
::
BUILD_TOKEN_HEADER
=>
build
.
token
)
}
before
{
build
.
run!
}
describe
"POST /builds/:id/artifacts/authorize"
do
describe
"POST /builds/:id/artifacts/authorize"
do
context
"should authorize posting artifact to running build"
do
context
"should authorize posting artifact to running build"
do
before
do
build
.
run!
end
it
"using token as parameter"
do
it
"using token as parameter"
do
post
authorize_url
,
{
token:
build
.
token
},
headers
post
authorize_url
,
{
token:
build
.
token
},
headers
expect
(
response
.
status
).
to
eq
(
200
)
expect
(
response
.
status
).
to
eq
(
200
)
...
@@ -180,10 +178,6 @@ describe Ci::API::API do
...
@@ -180,10 +178,6 @@ describe Ci::API::API do
end
end
context
"should fail to post too large artifact"
do
context
"should fail to post too large artifact"
do
before
do
build
.
run!
end
it
"using token as parameter"
do
it
"using token as parameter"
do
stub_application_setting
(
max_artifacts_size:
0
)
stub_application_setting
(
max_artifacts_size:
0
)
post
authorize_url
,
{
token:
build
.
token
,
filesize:
100
},
headers
post
authorize_url
,
{
token:
build
.
token
,
filesize:
100
},
headers
...
@@ -197,8 +191,8 @@ describe Ci::API::API do
...
@@ -197,8 +191,8 @@ describe Ci::API::API do
end
end
end
end
context
"should get denied"
do
context
'token is invalid'
do
it
do
it
'should respond with forbidden'
do
post
authorize_url
,
{
token:
'invalid'
,
filesize:
100
}
post
authorize_url
,
{
token:
'invalid'
,
filesize:
100
}
expect
(
response
.
status
).
to
eq
(
403
)
expect
(
response
.
status
).
to
eq
(
403
)
end
end
...
@@ -206,17 +200,13 @@ describe Ci::API::API do
...
@@ -206,17 +200,13 @@ describe Ci::API::API do
end
end
describe
"POST /builds/:id/artifacts"
do
describe
"POST /builds/:id/artifacts"
do
context
"
D
isable sanitizer"
do
context
"
d
isable sanitizer"
do
before
do
before
do
# by configuring this path we allow to pass temp file from any path
# by configuring this path we allow to pass temp file from any path
allow
(
ArtifactUploader
).
to
receive
(
:artifacts_upload_path
).
and_return
(
'/'
)
allow
(
ArtifactUploader
).
to
receive
(
:artifacts_upload_path
).
and_return
(
'/'
)
end
end
context
"should post artifact to running build"
do
context
"should post artifact to running build"
do
before
do
build
.
run!
end
it
"uses regual file post"
do
it
"uses regual file post"
do
upload_artifacts
(
file_upload
,
headers_with_token
,
false
)
upload_artifacts
(
file_upload
,
headers_with_token
,
false
)
expect
(
response
.
status
).
to
eq
(
201
)
expect
(
response
.
status
).
to
eq
(
201
)
...
@@ -244,10 +234,7 @@ describe Ci::API::API do
...
@@ -244,10 +234,7 @@ describe Ci::API::API do
let
(
:stored_artifacts_file
)
{
build
.
reload
.
artifacts_file
.
file
}
let
(
:stored_artifacts_file
)
{
build
.
reload
.
artifacts_file
.
file
}
let
(
:stored_metadata_file
)
{
build
.
reload
.
artifacts_metadata
.
file
}
let
(
:stored_metadata_file
)
{
build
.
reload
.
artifacts_metadata
.
file
}
before
do
before
{
post
(
post_url
,
post_data
,
headers_with_token
)
}
build
.
run!
post
(
post_url
,
post_data
,
headers_with_token
)
end
context
'post data accelerated by workhorse is correct'
do
context
'post data accelerated by workhorse is correct'
do
let
(
:post_data
)
do
let
(
:post_data
)
do
...
@@ -257,11 +244,8 @@ describe Ci::API::API do
...
@@ -257,11 +244,8 @@ describe Ci::API::API do
'metadata.name'
=>
metadata
.
original_filename
}
'metadata.name'
=>
metadata
.
original_filename
}
end
end
it
'responds with valid status'
do
expect
(
response
.
status
).
to
eq
(
201
)
end
it
'stores artifacts and artifacts metadata'
do
it
'stores artifacts and artifacts metadata'
do
expect
(
response
.
status
).
to
eq
(
201
)
expect
(
stored_artifacts_file
.
original_filename
).
to
eq
(
artifacts
.
original_filename
)
expect
(
stored_artifacts_file
.
original_filename
).
to
eq
(
artifacts
.
original_filename
)
expect
(
stored_metadata_file
.
original_filename
).
to
eq
(
metadata
.
original_filename
)
expect
(
stored_metadata_file
.
original_filename
).
to
eq
(
metadata
.
original_filename
)
end
end
...
@@ -282,56 +266,42 @@ describe Ci::API::API do
...
@@ -282,56 +266,42 @@ describe Ci::API::API do
end
end
end
end
context
"artifacts file is too large"
do
context
"should fail to post too large artifact"
do
it
"should fail to post too large artifact"
do
before
do
build
.
run!
end
it
do
stub_application_setting
(
max_artifacts_size:
0
)
stub_application_setting
(
max_artifacts_size:
0
)
upload_artifacts
(
file_upload
,
headers_with_token
)
upload_artifacts
(
file_upload
,
headers_with_token
)
expect
(
response
.
status
).
to
eq
(
413
)
expect
(
response
.
status
).
to
eq
(
413
)
end
end
end
end
context
"should fail to post artifacts without file"
do
context
"artifacts post request does not contain file"
do
before
do
it
"should fail to post artifacts without file"
do
build
.
run!
end
it
do
post
post_url
,
{},
headers_with_token
post
post_url
,
{},
headers_with_token
expect
(
response
.
status
).
to
eq
(
400
)
expect
(
response
.
status
).
to
eq
(
400
)
end
end
end
end
context
"should fail to post artifacts without GitLab-Workhorse"
do
context
'GitLab Workhorse is not configured'
do
before
do
it
"should fail to post artifacts without GitLab-Workhorse"
do
build
.
run!
end
it
do
post
post_url
,
{
token:
build
.
token
},
{}
post
post_url
,
{
token:
build
.
token
},
{}
expect
(
response
.
status
).
to
eq
(
403
)
expect
(
response
.
status
).
to
eq
(
403
)
end
end
end
end
end
end
context
"
should fail to post artifacts for
outside of tmp path"
do
context
"
artifacts are being stored
outside of tmp path"
do
before
do
before
do
# by configuring this path we allow to pass file from @tmpdir only
# by configuring this path we allow to pass file from @tmpdir only
# but all temporary files are stored in system tmp directory
# but all temporary files are stored in system tmp directory
@tmpdir
=
Dir
.
mktmpdir
@tmpdir
=
Dir
.
mktmpdir
allow
(
ArtifactUploader
).
to
receive
(
:artifacts_upload_path
).
and_return
(
@tmpdir
)
allow
(
ArtifactUploader
).
to
receive
(
:artifacts_upload_path
).
and_return
(
@tmpdir
)
build
.
run!
end
end
after
do
after
do
FileUtils
.
remove_entry
@tmpdir
FileUtils
.
remove_entry
@tmpdir
end
end
it
do
it
"should fail to post artifacts for outside of tmp path"
do
upload_artifacts
(
file_upload
,
headers_with_token
)
upload_artifacts
(
file_upload
,
headers_with_token
)
expect
(
response
.
status
).
to
eq
(
400
)
expect
(
response
.
status
).
to
eq
(
400
)
end
end
...
@@ -353,15 +323,9 @@ describe Ci::API::API do
...
@@ -353,15 +323,9 @@ describe Ci::API::API do
let
(
:build
)
{
create
(
:ci_build
,
:artifacts
)
}
let
(
:build
)
{
create
(
:ci_build
,
:artifacts
)
}
before
{
delete
delete_url
,
token:
build
.
token
}
before
{
delete
delete_url
,
token:
build
.
token
}
it
'should re
spond valid statu
s'
do
it
'should re
move build artifact
s'
do
expect
(
response
.
status
).
to
eq
(
200
)
expect
(
response
.
status
).
to
eq
(
200
)
end
it
'should remove artifacts file'
do
expect
(
build
.
artifacts_file
.
exists?
).
to
be_falsy
expect
(
build
.
artifacts_file
.
exists?
).
to
be_falsy
end
it
'should remove artifacts metadata'
do
expect
(
build
.
artifacts_metadata
.
exists?
).
to
be_falsy
expect
(
build
.
artifacts_metadata
.
exists?
).
to
be_falsy
end
end
end
end
...
@@ -376,11 +340,8 @@ describe Ci::API::API do
...
@@ -376,11 +340,8 @@ describe Ci::API::API do
'Content-Disposition'
=>
'attachment; filename=ci_build_artifacts.zip'
}
'Content-Disposition'
=>
'attachment; filename=ci_build_artifacts.zip'
}
end
end
it
'should respond with valid status'
do
expect
(
response
.
status
).
to
eq
(
200
)
end
it
'should download artifact'
do
it
'should download artifact'
do
expect
(
response
.
status
).
to
eq
(
200
)
expect
(
response
.
headers
).
to
include
download_headers
expect
(
response
.
headers
).
to
include
download_headers
end
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