diff options
author | Robert Speicher <rspeicher@gmail.com> | 2017-02-28 13:34:43 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2017-03-06 14:41:10 -0500 |
commit | 5c41338fa30b5795309957c71202b11a71cccef0 (patch) | |
tree | 5115c177c3abe55fe1e71208fa46a5cec201291f /spec/uploaders/records_uploads_spec.rb | |
parent | c4c2ac10d0997dd4e7bc958bca6052144a58839e (diff) | |
download | gitlab-ce-5c41338fa30b5795309957c71202b11a71cccef0.tar.gz |
Handle relative and absolute Upload paths in the Uploaders
Diffstat (limited to 'spec/uploaders/records_uploads_spec.rb')
-rw-r--r-- | spec/uploaders/records_uploads_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/uploaders/records_uploads_spec.rb b/spec/uploaders/records_uploads_spec.rb index a104dc4257f..5c26e334a6e 100644 --- a/spec/uploaders/records_uploads_spec.rb +++ b/spec/uploaders/records_uploads_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' describe RecordsUploads do let(:uploader) do - example_uploader = Class.new(GitlabUploader) do + class RecordsUploadsExampleUploader < GitlabUploader include RecordsUploads storage :file @@ -12,7 +12,7 @@ describe RecordsUploads do end end - example_uploader.new + RecordsUploadsExampleUploader.new end def upload_fixture(filename) @@ -59,10 +59,10 @@ describe RecordsUploads do it 'it destroys Upload records at the same path before recording' do existing = Upload.create!( - path: File.join(CarrierWave.root, 'uploads', 'rails_sample.jpg'), + path: File.join('uploads', 'rails_sample.jpg'), size: 512.kilobytes, model: build_stubbed(:user), - uploader: described_class.to_s + uploader: uploader.class.to_s ) uploader.store!(upload_fixture('rails_sample.jpg')) |