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
ca087235
Commit
ca087235
authored
Nov 23, 2017
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ObjectStoreUploader spec failures
parent
347bce29
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
spec/uploaders/object_store_uploader_spec.rb
spec/uploaders/object_store_uploader_spec.rb
+6
-2
No files found.
spec/uploaders/object_store_uploader_spec.rb
View file @
ca087235
...
@@ -6,6 +6,10 @@ describe ObjectStoreUploader do
...
@@ -6,6 +6,10 @@ describe ObjectStoreUploader do
let
(
:object
)
{
double
}
let
(
:object
)
{
double
}
let
(
:uploader
)
{
uploader_class
.
new
(
object
,
:file
)
}
let
(
:uploader
)
{
uploader_class
.
new
(
object
,
:file
)
}
before
do
allow
(
object
.
class
).
to
receive
(
:uploader_option
).
with
(
:file
,
:mount_on
)
{
nil
}
end
describe
'#object_store'
do
describe
'#object_store'
do
it
"calls artifacts_file_store on object"
do
it
"calls artifacts_file_store on object"
do
expect
(
object
).
to
receive
(
:file_store
)
expect
(
object
).
to
receive
(
:file_store
)
...
@@ -83,7 +87,7 @@ describe ObjectStoreUploader do
...
@@ -83,7 +87,7 @@ describe ObjectStoreUploader do
end
end
context
'when using JobArtifactsUploader'
do
context
'when using JobArtifactsUploader'
do
let
(
:artifact
)
{
create
(
:ci_job_artifact
,
file_store:
store
)
}
let
(
:artifact
)
{
create
(
:ci_job_artifact
,
:archive
,
file_store:
store
)
}
let
(
:uploader
)
{
artifact
.
file
}
let
(
:uploader
)
{
artifact
.
file
}
context
'checking described_class'
do
context
'checking described_class'
do
...
@@ -130,7 +134,7 @@ describe ObjectStoreUploader do
...
@@ -130,7 +134,7 @@ describe ObjectStoreUploader do
end
end
describe
'#migrate!'
do
describe
'#migrate!'
do
let
(
:artifact
)
{
create
(
:ci_job_artifact
,
file_store:
store
)
}
let
(
:artifact
)
{
create
(
:ci_job_artifact
,
:archive
,
file_store:
store
)
}
let
(
:uploader
)
{
artifact
.
file
}
let
(
:uploader
)
{
artifact
.
file
}
let
(
:store
)
{
described_class
::
LOCAL_STORE
}
let
(
:store
)
{
described_class
::
LOCAL_STORE
}
...
...
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