Commit 069eee02 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'jej/object-storage-uploader-migrate-with-license-callback' into 'master'

ObjectStoreUploader#migrate! uses with_callbacks to trigger verify_license!

Closes #3370

See merge request !2863
parents ed92fc8e c18e8f58
......@@ -106,18 +106,20 @@ class ObjectStoreUploader < CarrierWave::Uploader::Base
# change storage
self.object_store = new_store
storage.store!(file).tap do |new_file|
# since we change storage store the new storage
# in case of failure delete new file
begin
subject.save!
rescue => e
new_file.delete
self.object_store = old_store
raise e
with_callbacks(:store, file) do
storage.store!(file).tap do |new_file|
# since we change storage store the new storage
# in case of failure delete new file
begin
subject.save!
rescue => e
new_file.delete
self.object_store = old_store
raise e
end
old_file.delete
end
old_file.delete
end
end
......
......@@ -184,6 +184,16 @@ describe ObjectStoreUploader do
end
end
context 'when storage is unlicensed' do
before do
stub_artifacts_object_storage(licensed: false)
end
it "raises an error" do
expect { subject }.to raise_error(/Object Storage feature is missing/)
end
end
context 'when credentials are set' do
before do
stub_artifacts_object_storage
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment