Skip to content

Commit 1bfdccc

Browse files
committed
Don't unlink files before closing them (#35539, #35721).
Patch by Pavel Rosický. git-svn-id: http://svn.redmine.org/redmine/trunk@21194 e93f8b46-1217-0410-a6f0-8f06a7374b81
1 parent 1578c72 commit 1bfdccc

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

test/unit/attachment_test.rb

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,27 +276,31 @@ def test_filename_should_be_sanitized
276276
end
277277

278278
def test_create_diskfile
279+
path = nil
279280
Attachment.create_diskfile("test_file.txt") do |f|
280281
path = f.path
281282
assert_match(/^\d{12}_test_file.txt$/, File.basename(path))
282283
assert_equal 'test_file.txt', File.basename(path)[13..-1]
283-
File.unlink f.path
284284
end
285+
File.unlink path
285286

286287
Attachment.create_diskfile("test_accentué.txt") do |f|
288+
path = f.path
287289
assert_equal '770c509475505f37c2b8fb6030434d6b.txt', File.basename(f.path)[13..-1]
288-
File.unlink f.path
289290
end
291+
File.unlink path
290292

291293
Attachment.create_diskfile("test_accentué") do |f|
294+
path = f.path
292295
assert_equal 'f8139524ebb8f32e51976982cd20a85d', File.basename(f.path)[13..-1]
293-
File.unlink f.path
294296
end
297+
File.unlink path
295298

296299
Attachment.create_diskfile("test_accentué.ça") do |f|
300+
path = f.path
297301
assert_equal 'cbb5b0f30978ba03731d61f9f6d10011', File.basename(f.path)[13..-1]
298-
File.unlink f.path
299302
end
303+
File.unlink path
300304
end
301305

302306
def test_title

0 commit comments

Comments
 (0)