Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-09-12 12:39:21 +0300
committerKamil Trzciński <ayufan@ayufan.eu>2018-02-28 22:39:30 +0300
commitec72abf53fd82ca3e7f126536a83b27b368696ec (patch)
treec9ce3610b5a48b635be375c5aea6abb9be12d162 /spec/uploaders
parent965dc28691e2d70b7040e28d90ccbc3721a9e416 (diff)
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
Diffstat (limited to 'spec/uploaders')
-rw-r--r--spec/uploaders/object_store_uploader_spec.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/spec/uploaders/object_store_uploader_spec.rb b/spec/uploaders/object_store_uploader_spec.rb
index c5554502980..dd08a40eb97 100644
--- a/spec/uploaders/object_store_uploader_spec.rb
+++ b/spec/uploaders/object_store_uploader_spec.rb
@@ -111,6 +111,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