summaryrefslogtreecommitdiff
path: root/spec/uploaders
diff options
context:
space:
mode:
authorMicaël Bergeron <mbergeron@gitlab.com>2018-02-28 12:21:40 -0500
committerMicaël Bergeron <mbergeron@gitlab.com>2018-03-01 10:40:40 -0500
commit508938873cb00b8eed53d6aacdd0e0940d8425d9 (patch)
tree1812200376a55f78ada583802f06dd9dd76d48fc /spec/uploaders
parentd59210de58dc8a377130cfdd3fc3197a4ca7bb1d (diff)
downloadgitlab-ce-508938873cb00b8eed53d6aacdd0e0940d8425d9.tar.gz
remove the license check
Diffstat (limited to 'spec/uploaders')
-rw-r--r--spec/uploaders/object_storage_spec.rb51
1 files changed, 0 insertions, 51 deletions
diff --git a/spec/uploaders/object_storage_spec.rb b/spec/uploaders/object_storage_spec.rb
index 64b59acb286..489b6707c6e 100644
--- a/spec/uploaders/object_storage_spec.rb
+++ b/spec/uploaders/object_storage_spec.rb
@@ -258,16 +258,6 @@ describe ObjectStorage 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
@@ -333,45 +323,4 @@ describe ObjectStorage do
it { is_expected.to eq(false) }
end
-
- describe '#verify_license!' do
- subject { uploader.verify_license!(nil) }
-
- context 'when using local storage' do
- before do
- expect(object).to receive(:file_store) { described_class::Store::LOCAL }
- end
-
- it "does not raise an error" do
- expect { subject }.not_to raise_error
- end
- end
-
- context 'when using remote storage' do
- before do
- uploader_class.storage_options double(object_store: double(enabled: true))
- expect(object).to receive(:file_store) { described_class::Store::REMOTE }
- end
-
- context 'feature is not available' do
- before do
- expect(License).to receive(:feature_available?).with(:object_storage).and_return(false)
- end
-
- it "does raise an error" do
- expect { subject }.to raise_error(/Object Storage feature is missing/)
- end
- end
-
- context 'feature is available' do
- before do
- expect(License).to receive(:feature_available?).with(:object_storage).and_return(true)
- end
-
- it "does not raise an error" do
- expect { subject }.not_to raise_error
- end
- end
- end
- end
end