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
472cb9ee
Commit
472cb9ee
authored
Nov 23, 2017
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add missing :archive to :ci_job_artifact
parent
e21c0dee
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
spec/requests/api/jobs_spec.rb
spec/requests/api/jobs_spec.rb
+2
-2
spec/requests/api/runner_spec.rb
spec/requests/api/runner_spec.rb
+1
-1
spec/requests/api/v3/builds_spec.rb
spec/requests/api/v3/builds_spec.rb
+2
-2
spec/tasks/gitlab/artifacts_rake_spec.rb
spec/tasks/gitlab/artifacts_rake_spec.rb
+1
-1
spec/workers/object_storage_upload_worker_spec.rb
spec/workers/object_storage_upload_worker_spec.rb
+1
-1
No files found.
spec/requests/api/jobs_spec.rb
View file @
472cb9ee
...
...
@@ -324,7 +324,7 @@ describe API::Jobs do
context
'when artifacts are stored remotely'
do
let
(
:job
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
let!
(
:artifact
)
{
create
(
:ci_job_artifact
,
:remote_store
,
job:
job
)
}
let!
(
:artifact
)
{
create
(
:ci_job_artifact
,
:
archive
,
:
remote_store
,
job:
job
)
}
before
do
job
.
reload
...
...
@@ -453,7 +453,7 @@ describe API::Jobs do
context
'when artifacts are stored remotely'
do
let
(
:job
)
{
create
(
:ci_build
,
pipeline:
pipeline
,
user:
api_user
)
}
let!
(
:artifact
)
{
create
(
:ci_job_artifact
,
:remote_store
,
job:
job
)
}
let!
(
:artifact
)
{
create
(
:ci_job_artifact
,
:
archive
,
:
remote_store
,
job:
job
)
}
before
do
job
.
reload
...
...
spec/requests/api/runner_spec.rb
View file @
472cb9ee
...
...
@@ -1166,7 +1166,7 @@ describe API::Runner do
let
(
:store
)
{
JobArtifactUploader
::
LOCAL_STORE
}
before
do
create
(
:ci_job_artifact
,
file_store:
store
,
job:
job
)
create
(
:ci_job_artifact
,
:archive
,
file_store:
store
,
job:
job
)
download_artifact
end
...
...
spec/requests/api/v3/builds_spec.rb
View file @
472cb9ee
...
...
@@ -216,7 +216,7 @@ describe API::V3::Builds do
context
'when artifacts are stored remotely'
do
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
let!
(
:artifact
)
{
create
(
:ci_job_artifact
,
:remote_store
,
job:
build
)
}
let!
(
:artifact
)
{
create
(
:ci_job_artifact
,
:
archive
,
:
remote_store
,
job:
build
)
}
it
'returns location redirect'
do
get
v3_api
(
"/projects/
#{
project
.
id
}
/builds/
#{
build
.
id
}
/artifacts"
,
api_user
)
...
...
@@ -313,7 +313,7 @@ describe API::V3::Builds do
context
'when artifacts are stored remotely'
do
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
let!
(
:artifact
)
{
create
(
:ci_job_artifact
,
:remote_store
,
job:
build
)
}
let!
(
:artifact
)
{
create
(
:ci_job_artifact
,
:
archive
,
:
remote_store
,
job:
build
)
}
before
do
build
.
reload
...
...
spec/tasks/gitlab/artifacts_rake_spec.rb
View file @
472cb9ee
...
...
@@ -69,7 +69,7 @@ describe 'gitlab:artifacts namespace rake task' do
end
context
'job artifacts'
do
let!
(
:artifact
)
{
create
(
:ci_job_artifact
,
file_store:
store
)
}
let!
(
:artifact
)
{
create
(
:ci_job_artifact
,
:archive
,
file_store:
store
)
}
context
'when local storage is used'
do
let
(
:store
)
{
ObjectStoreUploader
::
LOCAL_STORE
}
...
...
spec/workers/object_storage_upload_worker_spec.rb
View file @
472cb9ee
...
...
@@ -83,7 +83,7 @@ describe ObjectStorageUploadWorker do
end
context
'for job artifacts'
do
let
(
:artifact
)
{
create
(
:ci_job_artifact
)
}
let
(
:artifact
)
{
create
(
:ci_job_artifact
,
:archive
)
}
let
(
:uploader_class
)
{
JobArtifactUploader
}
let
(
:subject_class
)
{
Ci
::
JobArtifact
}
let
(
:file_field
)
{
:file
}
...
...
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