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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
2e311d9d
Commit
2e311d9d
authored
May 29, 2017
by
Jarka Kadlecova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support uploads for newly created personal snippets
parent
4464c22d
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
164 additions
and
36 deletions
+164
-36
app/assets/javascripts/dropzone_input.js
app/assets/javascripts/dropzone_input.js
+1
-1
app/controllers/snippets_controller.rb
app/controllers/snippets_controller.rb
+1
-1
app/controllers/uploads_controller.rb
app/controllers/uploads_controller.rb
+9
-2
app/uploaders/file_mover.rb
app/uploaders/file_mover.rb
+22
-7
app/uploaders/records_uploads.rb
app/uploaders/records_uploads.rb
+4
-3
app/views/shared/form_elements/_description.html.haml
app/views/shared/form_elements/_description.html.haml
+1
-1
app/views/shared/snippets/_header.html.haml
app/views/shared/snippets/_header.html.haml
+6
-7
config/routes/uploads.rb
config/routes/uploads.rb
+5
-0
doc/api/project_snippets.md
doc/api/project_snippets.md
+1
-1
spec/controllers/uploads_controller_spec.rb
spec/controllers/uploads_controller_spec.rb
+34
-0
spec/features/projects/snippets/create_snippet_spec.rb
spec/features/projects/snippets/create_snippet_spec.rb
+3
-3
spec/features/snippets/create_snippet_spec.rb
spec/features/snippets/create_snippet_spec.rb
+22
-0
spec/features/snippets/edit_snippet_spec.rb
spec/features/snippets/edit_snippet_spec.rb
+3
-3
spec/uploaders/file_mover_spec.rb
spec/uploaders/file_mover_spec.rb
+44
-6
spec/uploaders/records_uploads_spec.rb
spec/uploaders/records_uploads_spec.rb
+8
-1
No files found.
app/assets/javascripts/dropzone_input.js
View file @
2e311d9d
...
@@ -199,7 +199,7 @@ window.DropzoneInput = (function() {
...
@@ -199,7 +199,7 @@ window.DropzoneInput = (function() {
};
};
addFileToForm
=
function
(
path
)
{
addFileToForm
=
function
(
path
)
{
$
(
form
).
append
(
'
<input type="hidden" name="files[]" value="
'
+
path
+
'
">
'
);
$
(
form
).
append
(
'
<input type="hidden" name="files[]" value="
'
+
_
.
escape
(
path
)
+
'
">
'
);
};
};
getFilename
=
function
(
e
)
{
getFilename
=
function
(
e
)
{
...
...
app/controllers/snippets_controller.rb
View file @
2e311d9d
...
@@ -45,7 +45,7 @@ class SnippetsController < ApplicationController
...
@@ -45,7 +45,7 @@ class SnippetsController < ApplicationController
@snippet
=
CreateSnippetService
.
new
(
nil
,
current_user
,
create_params
).
execute
@snippet
=
CreateSnippetService
.
new
(
nil
,
current_user
,
create_params
).
execute
move_temporary_files
if
params
[
:files
]
move_temporary_files
if
@snippet
.
valid?
&&
params
[
:files
]
recaptcha_check_with_fallback
{
render
:new
}
recaptcha_check_with_fallback
{
render
:new
}
end
end
...
...
app/controllers/uploads_controller.rb
View file @
2e311d9d
...
@@ -17,6 +17,8 @@ class UploadsController < ApplicationController
...
@@ -17,6 +17,8 @@ class UploadsController < ApplicationController
end
end
def
authorize_access!
def
authorize_access!
return
nil
unless
model
authorized
=
authorized
=
case
model
case
model
when
Note
when
Note
...
@@ -35,7 +37,7 @@ class UploadsController < ApplicationController
...
@@ -35,7 +37,7 @@ class UploadsController < ApplicationController
end
end
def
authorize_create_access!
def
authorize_create_access!
return
unless
model
return
nil
unless
model
# for now we support only personal snippets comments
# for now we support only personal snippets comments
authorized
=
can?
(
current_user
,
:comment_personal_snippet
,
model
)
authorized
=
can?
(
current_user
,
:comment_personal_snippet
,
model
)
...
@@ -77,7 +79,12 @@ class UploadsController < ApplicationController
...
@@ -77,7 +79,12 @@ class UploadsController < ApplicationController
def
uploader
def
uploader
return
@uploader
if
defined?
(
@uploader
)
return
@uploader
if
defined?
(
@uploader
)
if
model
.
is_a?
(
PersonalSnippet
)
case
model
when
nil
@uploader
=
PersonalFileUploader
.
new
(
nil
,
params
[
:secret
])
@uploader
.
retrieve_from_store!
(
params
[
:filename
])
when
PersonalSnippet
@uploader
=
PersonalFileUploader
.
new
(
model
,
params
[
:secret
])
@uploader
=
PersonalFileUploader
.
new
(
model
,
params
[
:secret
])
@uploader
.
retrieve_from_store!
(
params
[
:filename
])
@uploader
.
retrieve_from_store!
(
params
[
:filename
])
...
...
app/uploaders/file_mover.rb
View file @
2e311d9d
class
FileMover
class
FileMover
attr_reader
:secret
,
:file_name
,
:model
attr_reader
:secret
,
:file_name
,
:model
,
:update_field
def
initialize
(
file_path
,
model
,
update_field
=
:description
)
def
initialize
(
file_path
,
model
,
update_field
=
:description
)
@secret
=
File
.
split
(
File
.
dirname
(
file_path
)).
last
@secret
=
File
.
split
(
File
.
dirname
(
file_path
)).
last
@file_name
=
File
.
basename
(
file_path
)
@file_name
=
File
.
basename
(
file_path
)
@model
=
model
@model
=
model
@update_field
=
update_field
end
end
def
execute
def
execute
move
move
update_markdown
up
loader
.
record_upload
if
up
date_markdown
end
end
private
private
def
move
def
move
FileUtils
.
mkdir_p
(
file_path
)
FileUtils
.
mkdir_p
(
File
.
dirname
(
file_path
)
)
FileUtils
.
move
(
temp_file_path
,
file_path
)
FileUtils
.
move
(
temp_file_path
,
file_path
)
end
end
def
update_markdown
(
field
=
:description
)
def
update_markdown
updated_text
=
model
.
send
(
field
).
sub
(
temp_file_uploader
.
to_markdown
,
uploader
.
to_markdown
)
updated_text
=
model
.
read_attribute
(
update_field
).
gsub
(
temp_file_uploader
.
to_markdown
,
uploader
.
to_markdown
)
model
.
update_attribute
(
field
,
updated_text
)
model
.
update_attribute
(
update_field
,
updated_text
)
true
rescue
revert
false
end
end
def
temp_file_path
def
temp_file_path
return
@temp_file_path
if
@temp_file_path
temp_file_uploader
.
retrieve_from_store!
(
file_name
)
temp_file_uploader
.
retrieve_from_store!
(
file_name
)
temp_file_uploader
.
file
.
path
@temp_file_path
=
temp_file_uploader
.
file
.
path
end
end
def
file_path
def
file_path
...
@@ -45,4 +54,10 @@ class FileMover
...
@@ -45,4 +54,10 @@ class FileMover
def
temp_file_uploader
def
temp_file_uploader
@temp_file_uploader
||=
PersonalFileUploader
.
new
(
nil
,
secret
)
@temp_file_uploader
||=
PersonalFileUploader
.
new
(
nil
,
secret
)
end
end
def
revert
Rails
.
logger
.
warn
(
"Markdown not updated, file move reverted for
#{
model
}
"
)
FileUtils
.
move
(
file_path
,
temp_file_path
)
end
end
end
app/uploaders/records_uploads.rb
View file @
2e311d9d
...
@@ -6,8 +6,6 @@ module RecordsUploads
...
@@ -6,8 +6,6 @@ module RecordsUploads
before
:remove
,
:destroy_upload
before
:remove
,
:destroy_upload
end
end
private
# After storing an attachment, create a corresponding Upload record
# After storing an attachment, create a corresponding Upload record
#
#
# NOTE: We're ignoring the argument passed to this callback because we want
# NOTE: We're ignoring the argument passed to this callback because we want
...
@@ -15,13 +13,16 @@ module RecordsUploads
...
@@ -15,13 +13,16 @@ module RecordsUploads
# `Tempfile` object the callback gets.
# `Tempfile` object the callback gets.
#
#
# Called `after :store`
# Called `after :store`
def
record_upload
(
_tempfile
)
def
record_upload
(
_tempfile
=
nil
)
return
unless
model
return
unless
file_storage?
return
unless
file_storage?
return
unless
file
.
exists?
return
unless
file
.
exists?
Upload
.
record
(
self
)
Upload
.
record
(
self
)
end
end
private
# Before removing an attachment, destroy any Upload records at the same path
# Before removing an attachment, destroy any Upload records at the same path
#
#
# Called `before :remove`
# Called `before :remove`
...
...
app/views/shared/form_elements/_description.html.haml
View file @
2e311d9d
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
-
model
=
local_assigns
.
fetch
(
:model
)
-
model
=
local_assigns
.
fetch
(
:model
)
-
form
=
local_assigns
.
fetch
(
:form
)
-
form
=
local_assigns
.
fetch
(
:form
)
-
supports_slash_commands
=
!
model
.
persiste
d?
-
supports_slash_commands
=
model
.
new_recor
d?
-
if
supports_slash_commands
-
if
supports_slash_commands
-
preview_url
=
preview_markdown_path
(
project
,
slash_commands_target_type:
model
.
class
.
name
)
-
preview_url
=
preview_markdown_path
(
project
,
slash_commands_target_type:
model
.
class
.
name
)
...
...
app/views/shared/snippets/_header.html.haml
View file @
2e311d9d
...
@@ -22,10 +22,9 @@
...
@@ -22,10 +22,9 @@
-
if
@snippet
.
updated_at
!=
@snippet
.
created_at
-
if
@snippet
.
updated_at
!=
@snippet
.
created_at
=
edited_time_ago_with_tooltip
(
@snippet
,
placement:
'bottom'
,
html_class:
'snippet-edited-ago'
,
exclude_author:
true
)
=
edited_time_ago_with_tooltip
(
@snippet
,
placement:
'bottom'
,
html_class:
'snippet-edited-ago'
,
exclude_author:
true
)
%div
-
if
@snippet
.
description
.
present?
-
if
@snippet
.
description
.
present?
.description
.description
.wiki
.wiki
=
markdown_field
(
@snippet
,
:description
)
=
markdown_field
(
@snippet
,
:description
)
%textarea
.hidden.js-task-list-field
%textarea
.hidden.js-task-list-field
=
@snippet
.
description
=
@snippet
.
description
config/routes/uploads.rb
View file @
2e311d9d
...
@@ -9,6 +9,11 @@ scope path: :uploads do
...
@@ -9,6 +9,11 @@ scope path: :uploads do
to:
'uploads#show'
,
to:
'uploads#show'
,
constraints:
{
model:
/personal_snippet/
,
id:
/\d+/
,
filename:
/[^\/]+/
}
constraints:
{
model:
/personal_snippet/
,
id:
/\d+/
,
filename:
/[^\/]+/
}
# show temporary uploads
get
'temp/:secret/:filename'
,
to:
'uploads#show'
,
constraints:
{
filename:
/[^\/]+/
}
# Appearance
# Appearance
get
":model/:mounted_as/:id/:filename"
,
get
":model/:mounted_as/:id/:filename"
,
to:
"uploads#show"
,
to:
"uploads#show"
,
...
...
doc/api/project_snippets.md
View file @
2e311d9d
...
@@ -73,7 +73,7 @@ Parameters:
...
@@ -73,7 +73,7 @@ Parameters:
-
`file_name`
(required) - The name of a snippet file
-
`file_name`
(required) - The name of a snippet file
-
`description`
(optional) - The description of a snippet
-
`description`
(optional) - The description of a snippet
-
`code`
(required) - The content of a snippet
-
`code`
(required) - The content of a snippet
-
`visibility`
(
optional
) - The snippet's visibility
-
`visibility`
(
required
) - The snippet's visibility
## Update snippet
## Update snippet
...
...
spec/controllers/uploads_controller_spec.rb
View file @
2e311d9d
...
@@ -92,6 +92,40 @@ describe UploadsController do
...
@@ -92,6 +92,40 @@ describe UploadsController do
end
end
end
end
end
end
context
'temporal with valid image'
do
subject
do
post
:create
,
model:
'personal_snippet'
,
file:
jpg
,
format: :json
end
it
'returns a content with original filename, new link, and correct type.'
do
subject
expect
(
response
.
body
).
to
match
'\"alt\":\"rails_sample\"'
expect
(
response
.
body
).
to
match
"
\"
url
\"
:
\"
/uploads/temp"
end
it
'does not create an Upload record'
do
expect
{
subject
}.
not_to
change
{
Upload
.
count
}
end
end
context
'temporal with valid non-image file'
do
subject
do
post
:create
,
model:
'personal_snippet'
,
file:
txt
,
format: :json
end
it
'returns a content with original filename, new link, and correct type.'
do
subject
expect
(
response
.
body
).
to
match
'\"alt\":\"doc_sample.txt\"'
expect
(
response
.
body
).
to
match
"
\"
url
\"
:
\"
/uploads/temp"
end
it
'does not create an Upload record'
do
expect
{
subject
}.
not_to
change
{
Upload
.
count
}
end
end
end
end
end
end
...
...
spec/features/projects/snippets/create_snippet_spec.rb
View file @
2e311d9d
...
@@ -27,7 +27,7 @@ feature 'Create Snippet', :js, feature: true do
...
@@ -27,7 +27,7 @@ feature 'Create Snippet', :js, feature: true do
it
'creates a new snippet'
do
it
'creates a new snippet'
do
fill_form
fill_form
click_button
(
'Create snippet'
)
click_button
(
'Create snippet'
)
wait_for_
ajax
wait_for_
requests
expect
(
page
).
to
have_content
(
'My Snippet Title'
)
expect
(
page
).
to
have_content
(
'My Snippet Title'
)
expect
(
page
).
to
have_content
(
'Hello World!'
)
expect
(
page
).
to
have_content
(
'Hello World!'
)
...
@@ -44,7 +44,7 @@ feature 'Create Snippet', :js, feature: true do
...
@@ -44,7 +44,7 @@ feature 'Create Snippet', :js, feature: true do
expect
(
page
.
find_field
(
"project_snippet_description"
).
value
).
to
have_content
(
'banana_sample'
)
expect
(
page
.
find_field
(
"project_snippet_description"
).
value
).
to
have_content
(
'banana_sample'
)
click_button
(
'Create snippet'
)
click_button
(
'Create snippet'
)
wait_for_
ajax
wait_for_
requests
link
=
find
(
'a.no-attachment-icon img[alt="banana_sample"]'
)[
'src'
]
link
=
find
(
'a.no-attachment-icon img[alt="banana_sample"]'
)[
'src'
]
expect
(
link
).
to
match
(
%r{/
#{
Regexp
.
escape
(
project
.
full_path
)
}
/uploads/
\h
{32}/banana_sample
\.
gif
\z
}
)
expect
(
link
).
to
match
(
%r{/
#{
Regexp
.
escape
(
project
.
full_path
)
}
/uploads/
\h
{32}/banana_sample
\.
gif
\z
}
)
...
@@ -60,7 +60,7 @@ feature 'Create Snippet', :js, feature: true do
...
@@ -60,7 +60,7 @@ feature 'Create Snippet', :js, feature: true do
dropzone_file
Rails
.
root
.
join
(
'spec'
,
'fixtures'
,
'banana_sample.gif'
)
dropzone_file
Rails
.
root
.
join
(
'spec'
,
'fixtures'
,
'banana_sample.gif'
)
click_button
(
'Create snippet'
)
click_button
(
'Create snippet'
)
wait_for_
ajax
wait_for_
requests
expect
(
page
).
to
have_content
(
'My Snippet Title'
)
expect
(
page
).
to
have_content
(
'My Snippet Title'
)
expect
(
page
).
to
have_content
(
'Hello World!'
)
expect
(
page
).
to
have_content
(
'Hello World!'
)
...
...
spec/features/snippets/create_snippet_spec.rb
View file @
2e311d9d
...
@@ -30,6 +30,22 @@ feature 'Create Snippet', :js, feature: true do
...
@@ -30,6 +30,22 @@ feature 'Create Snippet', :js, feature: true do
expect
(
page
).
to
have_content
(
'Hello World!'
)
expect
(
page
).
to
have_content
(
'Hello World!'
)
end
end
scenario
'previews a snippet with file'
do
fill_in
'personal_snippet_description'
,
with:
'My Snippet'
dropzone_file
Rails
.
root
.
join
(
'spec'
,
'fixtures'
,
'banana_sample.gif'
)
find
(
'.js-md-preview-button'
).
click
page
.
within
(
'#new_personal_snippet .md-preview'
)
do
expect
(
page
).
to
have_content
(
'My Snippet'
)
link
=
find
(
'a.no-attachment-icon img[alt="banana_sample"]'
)[
'src'
]
expect
(
link
).
to
match
(
%r{/uploads/temp/
\h
{32}/banana_sample
\.
gif
\z
}
)
visit
(
link
)
expect
(
page
.
status_code
).
to
eq
(
200
)
end
end
scenario
'uploads a file when dragging into textarea'
do
scenario
'uploads a file when dragging into textarea'
do
fill_form
fill_form
...
@@ -42,6 +58,9 @@ feature 'Create Snippet', :js, feature: true do
...
@@ -42,6 +58,9 @@ feature 'Create Snippet', :js, feature: true do
link
=
find
(
'a.no-attachment-icon img[alt="banana_sample"]'
)[
'src'
]
link
=
find
(
'a.no-attachment-icon img[alt="banana_sample"]'
)[
'src'
]
expect
(
link
).
to
match
(
%r{/uploads/personal_snippet/
#{
Snippet
.
last
.
id
}
/
\h
{32}/banana_sample
\.
gif
\z
}
)
expect
(
link
).
to
match
(
%r{/uploads/personal_snippet/
#{
Snippet
.
last
.
id
}
/
\h
{32}/banana_sample
\.
gif
\z
}
)
visit
(
link
)
expect
(
page
.
status_code
).
to
eq
(
200
)
end
end
scenario
'validation fails for the first time'
do
scenario
'validation fails for the first time'
do
...
@@ -64,6 +83,9 @@ feature 'Create Snippet', :js, feature: true do
...
@@ -64,6 +83,9 @@ feature 'Create Snippet', :js, feature: true do
expect
(
page
).
to
have_content
(
'Hello World!'
)
expect
(
page
).
to
have_content
(
'Hello World!'
)
link
=
find
(
'a.no-attachment-icon img[alt="banana_sample"]'
)[
'src'
]
link
=
find
(
'a.no-attachment-icon img[alt="banana_sample"]'
)[
'src'
]
expect
(
link
).
to
match
(
%r{/uploads/personal_snippet/
#{
Snippet
.
last
.
id
}
/
\h
{32}/banana_sample
\.
gif
\z
}
)
expect
(
link
).
to
match
(
%r{/uploads/personal_snippet/
#{
Snippet
.
last
.
id
}
/
\h
{32}/banana_sample
\.
gif
\z
}
)
visit
(
link
)
expect
(
page
.
status_code
).
to
eq
(
200
)
end
end
scenario
'Authenticated user creates a snippet with + in filename'
do
scenario
'Authenticated user creates a snippet with + in filename'
do
...
...
spec/features/snippets/edit_snippet_spec.rb
View file @
2e311d9d
...
@@ -13,14 +13,14 @@ feature 'Edit Snippet', :js, feature: true do
...
@@ -13,14 +13,14 @@ feature 'Edit Snippet', :js, feature: true do
login_as
(
user
)
login_as
(
user
)
visit
edit_snippet_path
(
snippet
)
visit
edit_snippet_path
(
snippet
)
wait_for_
ajax
wait_for_
requests
end
end
it
'updates the snippet'
do
it
'updates the snippet'
do
fill_in
'personal_snippet_title'
,
with:
'New Snippet Title'
fill_in
'personal_snippet_title'
,
with:
'New Snippet Title'
click_button
(
'Save changes'
)
click_button
(
'Save changes'
)
wait_for_
ajax
wait_for_
requests
expect
(
page
).
to
have_content
(
'New Snippet Title'
)
expect
(
page
).
to
have_content
(
'New Snippet Title'
)
end
end
...
@@ -30,7 +30,7 @@ feature 'Edit Snippet', :js, feature: true do
...
@@ -30,7 +30,7 @@ feature 'Edit Snippet', :js, feature: true do
expect
(
page
.
find_field
(
"personal_snippet_description"
).
value
).
to
have_content
(
'banana_sample'
)
expect
(
page
.
find_field
(
"personal_snippet_description"
).
value
).
to
have_content
(
'banana_sample'
)
click_button
(
'Save changes'
)
click_button
(
'Save changes'
)
wait_for_
ajax
wait_for_
requests
link
=
find
(
'a.no-attachment-icon img[alt="banana_sample"]'
)[
'src'
]
link
=
find
(
'a.no-attachment-icon img[alt="banana_sample"]'
)[
'src'
]
expect
(
link
).
to
match
(
%r{/uploads/personal_snippet/
#{
snippet
.
id
}
/
\h
{32}/banana_sample
\.
gif
\z
}
)
expect
(
link
).
to
match
(
%r{/uploads/personal_snippet/
#{
snippet
.
id
}
/
\h
{32}/banana_sample
\.
gif
\z
}
)
...
...
spec/uploaders/file_mover_spec.rb
View file @
2e311d9d
...
@@ -3,7 +3,10 @@ require 'spec_helper'
...
@@ -3,7 +3,10 @@ require 'spec_helper'
describe
FileMover
do
describe
FileMover
do
let
(
:filename
)
{
'banana_sample.gif'
}
let
(
:filename
)
{
'banana_sample.gif'
}
let
(
:file
)
{
fixture_file_upload
(
Rails
.
root
.
join
(
'spec'
,
'fixtures'
,
filename
))
}
let
(
:file
)
{
fixture_file_upload
(
Rails
.
root
.
join
(
'spec'
,
'fixtures'
,
filename
))
}
let
(
:temp_description
)
{
'test ![banana_sample](/uploads/temp/secret55/banana_sample.gif)'
}
let
(
:temp_description
)
do
'test ![banana_sample](/uploads/temp/secret55/banana_sample.gif) same ![banana_sample]'
\
'(/uploads/temp/secret55/banana_sample.gif)'
end
let
(
:temp_file_path
)
{
File
.
join
(
'secret55'
,
filename
).
to_s
}
let
(
:temp_file_path
)
{
File
.
join
(
'secret55'
,
filename
).
to_s
}
let
(
:file_path
)
{
File
.
join
(
'uploads'
,
'personal_snippet'
,
snippet
.
id
.
to_s
,
'secret55'
,
filename
).
to_s
}
let
(
:file_path
)
{
File
.
join
(
'uploads'
,
'personal_snippet'
,
snippet
.
id
.
to_s
,
'secret55'
,
filename
).
to_s
}
...
@@ -12,14 +15,49 @@ describe FileMover do
...
@@ -12,14 +15,49 @@ describe FileMover do
subject
{
described_class
.
new
(
file_path
,
snippet
).
execute
}
subject
{
described_class
.
new
(
file_path
,
snippet
).
execute
}
describe
'#execute'
do
describe
'#execute'
do
it
'updates the description correctly'
do
before
do
expect
(
FileUtils
).
to
receive
(
:mkdir_p
).
with
(
a_string_including
(
file_path
))
expect
(
FileUtils
).
to
receive
(
:mkdir_p
).
with
(
a_string_including
(
File
.
dirname
(
file_path
)
))
expect
(
FileUtils
).
to
receive
(
:move
).
with
(
a_string_including
(
temp_file_path
),
a_string_including
(
file_path
))
expect
(
FileUtils
).
to
receive
(
:move
).
with
(
a_string_including
(
temp_file_path
),
a_string_including
(
file_path
))
allow_any_instance_of
(
CarrierWave
::
SanitizedFile
).
to
receive
(
:exists?
).
and_return
(
true
)
allow_any_instance_of
(
CarrierWave
::
SanitizedFile
).
to
receive
(
:size
).
and_return
(
10
)
end
context
'when move and field update successful'
do
it
'updates the description correctly'
do
subject
expect
(
snippet
.
reload
.
description
)
.
to
eq
(
"test ![banana_sample](/uploads/personal_snippet/
#{
snippet
.
id
}
/secret55/banana_sample.gif)"
\
" same ![banana_sample](/uploads/personal_snippet/
#{
snippet
.
id
}
/secret55/banana_sample.gif)"
)
end
it
'creates a new update record'
do
expect
{
subject
}.
to
change
{
Upload
.
count
}.
by
(
1
)
end
end
context
'when update_markdown fails'
do
before
do
expect
(
FileUtils
).
to
receive
(
:move
).
with
(
a_string_including
(
file_path
),
a_string_including
(
temp_file_path
))
end
subject
{
described_class
.
new
(
file_path
,
snippet
,
:non_existing_field
).
execute
}
it
'does not update the description'
do
subject
subject
expect
(
snippet
.
reload
.
description
)
.
to
eq
(
"test ![banana_sample](/uploads/temp/secret55/banana_sample.gif)"
\
" same ![banana_sample](/uploads/temp/secret55/banana_sample.gif)"
)
end
expect
(
snippet
.
reload
.
description
)
it
'does not create a new update record'
do
.
to
eq
(
"test ![banana_sample](/uploads/personal_snippet/
#{
snippet
.
id
}
/secret55/banana_sample.gif)"
)
expect
{
subject
}.
not_to
change
{
Upload
.
count
}
end
end
end
end
end
end
end
spec/uploaders/records_uploads_spec.rb
View file @
2e311d9d
require
'rails_helper'
require
'rails_helper'
describe
RecordsUploads
do
describe
RecordsUploads
do
let
(
:uploader
)
do
let
!
(
:uploader
)
do
class
RecordsUploadsExampleUploader
<
GitlabUploader
class
RecordsUploadsExampleUploader
<
GitlabUploader
include
RecordsUploads
include
RecordsUploads
...
@@ -57,6 +57,13 @@ describe RecordsUploads do
...
@@ -57,6 +57,13 @@ describe RecordsUploads do
uploader
.
store!
(
upload_fixture
(
'rails_sample.jpg'
))
uploader
.
store!
(
upload_fixture
(
'rails_sample.jpg'
))
end
end
it
'does not create an Upload record if model is missing'
do
expect_any_instance_of
(
RecordsUploadsExampleUploader
).
to
receive
(
:model
).
and_return
(
nil
)
expect
(
Upload
).
not_to
receive
(
:record
).
with
(
uploader
)
uploader
.
store!
(
upload_fixture
(
'rails_sample.jpg'
))
end
it
'it destroys Upload records at the same path before recording'
do
it
'it destroys Upload records at the same path before recording'
do
existing
=
Upload
.
create!
(
existing
=
Upload
.
create!
(
path:
File
.
join
(
'uploads'
,
'rails_sample.jpg'
),
path:
File
.
join
(
'uploads'
,
'rails_sample.jpg'
),
...
...
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