diff options
author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-03 00:19:17 +0300 |
---|---|---|
committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-03 00:19:17 +0300 |
commit | b03b31659b0101dc4a5838bec7dca193706661cd (patch) | |
tree | 3bd1004659f85da6d149f89700b7c0e8388f0b31 /spec/uploaders/file_uploader_spec.rb | |
parent | 4484587ef8c9bf63c60359a0980dda95e854b744 (diff) |
fixing some broken merges
Diffstat (limited to 'spec/uploaders/file_uploader_spec.rb')
-rw-r--r-- | spec/uploaders/file_uploader_spec.rb | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/spec/uploaders/file_uploader_spec.rb b/spec/uploaders/file_uploader_spec.rb index 1f268fb7cb1..4b7dcbeda33 100644 --- a/spec/uploaders/file_uploader_spec.rb +++ b/spec/uploaders/file_uploader_spec.rb @@ -89,29 +89,6 @@ describe FileUploader do end end - describe 'callbacks' do - describe '#prune_store_dir after :remove' do - before do - uploader.store!(fixture_file_upload('spec/fixtures/doc_sample.txt')) - end - - def store_dir - File.expand_path(uploader.store_dir, uploader.root) - end - - it 'is called' do - expect(uploader).to receive(:prune_store_dir).once - - uploader.remove! - end - - it 'prune the store directory' do - expect { uploader.remove! } - .to change { File.exist?(store_dir) }.from(true).to(false) - end - end - end - describe "#migrate!" do before do uploader.store!(fixture_file_upload(Rails.root.join('spec/fixtures/dk.png'))) @@ -137,8 +114,5 @@ describe FileUploader do uploader.upload = upload end - - it_behaves_like "migrates", to_store: described_class::Store::REMOTE - it_behaves_like "migrates", from_store: described_class::Store::REMOTE, to_store: described_class::Store::LOCAL end end |