summaryrefslogtreecommitdiff
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-02-28 13:30:02 -0500
commita14d1454c2ff26ff60ebe96a7b46923776b1f321 (patch)
treec89ad9b1e3982790a667b6768b4671db17c1a149
parentdb5baaab9dcf3309a72308c1191a9fcd24782f00 (diff)
downloadgitlab-ce-40781-os-to-ce.tar.gz
remove the license check40781-os-to-ce
-rw-r--r--spec/models/lfs_object_spec.rb25
-rw-r--r--spec/uploaders/object_storage_spec.rb51
2 files changed, 0 insertions, 76 deletions
diff --git a/spec/models/lfs_object_spec.rb b/spec/models/lfs_object_spec.rb
index 87f4daab9be..a182116d637 100644
--- a/spec/models/lfs_object_spec.rb
+++ b/spec/models/lfs_object_spec.rb
@@ -21,19 +21,6 @@ describe LfsObject do
end
end
- describe '#destroy' do
- subject { create(:lfs_object, :with_file) }
-
- context 'when running in a Geo primary node' do
- set(:primary) { create(:geo_node, :primary) }
- set(:secondary) { create(:geo_node) }
-
- it 'logs an event to the Geo event log' do
- expect { subject.destroy }.to change(Geo::LfsObjectDeletedEvent, :count).by(1)
- end
- end
- end
-
describe '#schedule_background_upload' do
before do
stub_lfs_setting(enabled: true)
@@ -80,18 +67,6 @@ describe LfsObject do
lfs_object.save!
end
end
-
- context 'when is unlicensed' do
- before do
- stub_lfs_object_storage(background_upload: true, licensed: false)
- end
-
- it 'does not schedule the migration' do
- expect(ObjectStorage::BackgroundMoveWorker).not_to receive(:perform_async)
-
- subject
- end
- end
end
context 'when background upload is disabled' do
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