From 692f4b734f1976b690dccb5458c198b5205c51b5 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 3 Sep 2020 21:08:18 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/lib/uploaded_file_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/lib/uploaded_file_spec.rb') diff --git a/spec/lib/uploaded_file_spec.rb b/spec/lib/uploaded_file_spec.rb index 5ff46193b4f..cf2ab04b457 100644 --- a/spec/lib/uploaded_file_spec.rb +++ b/spec/lib/uploaded_file_spec.rb @@ -23,7 +23,7 @@ RSpec.describe UploadedFile do end subject do - described_class.from_params(params, :file, upload_path, file_path_override) + described_class.from_params(params, :file, [upload_path, Dir.tmpdir], file_path_override) end context 'when valid file is specified' do -- cgit v1.2.3