Don't forcefully close the uploaded file.

samvera · Oct 15, 2021 · 8a91c0b · 8a91c0b
1 parent 0b1a9ec
commit 8a91c0b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/lib/valkyrie/specs/shared_specs/storage_adapter.rb b/lib/valkyrie/specs/shared_specs/storage_adapter.rb
@@ -34,8 +34,8 @@ class Valkyrie::Specs::CustomResource < Valkyrie::Resource
     resource = Valkyrie::Specs::CustomResource.new(id: "testdiscovery")
     pre_open_files = open_files
     uploaded_file = storage_adapter.upload(file: file, original_filename: 'foo.jpg', resource: resource, fake_upload_argument: true)
-    expect(pre_open_files.size).to eq open_files.size
     file.close
+    expect(pre_open_files.size).to eq open_files.size
 
     pre_open_files = open_files
     the_file = storage_adapter.find_by(id: uploaded_file.id)

diff --git a/lib/valkyrie/storage/disk.rb b/lib/valkyrie/storage/disk.rb
@@ -18,7 +18,6 @@ def upload(file:, original_filename:, resource: nil, **_extra_arguments)
       new_path = path_generator.generate(resource: resource, file: file, original_filename: original_filename)
       FileUtils.mkdir_p(new_path.parent)
       file_mover.call(file.path, new_path)
-      file.try(:close)
       find_by(id: Valkyrie::ID.new("disk://#{new_path}"))
     end