diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /spec/uploaders | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'spec/uploaders')
-rw-r--r-- | spec/uploaders/object_storage_spec.rb | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/spec/uploaders/object_storage_spec.rb b/spec/uploaders/object_storage_spec.rb index b454b0ad8f8..a1d8695a8c9 100644 --- a/spec/uploaders/object_storage_spec.rb +++ b/spec/uploaders/object_storage_spec.rb @@ -441,22 +441,6 @@ RSpec.describe ObjectStorage do end end - shared_examples 'extracts base filename' do - it "returns true for ExtractsBase" do - expect(subject[:FeatureFlagExtractBase]).to be true - end - - context 'when workhorse_extract_filename_base is disabled' do - before do - stub_feature_flags(workhorse_extract_filename_base: false) - end - - it "returns false for ExtractsBase" do - expect(subject[:FeatureFlagExtractBase]).to be false - end - end - end - shared_examples 'uses local storage' do it_behaves_like 'returns the maximum size given' do it "returns temporary path" do @@ -518,7 +502,6 @@ RSpec.describe ObjectStorage do end it_behaves_like 'uses local storage' - it_behaves_like 'extracts base filename' end context 'when object storage is enabled' do @@ -526,8 +509,6 @@ RSpec.describe ObjectStorage do allow(Gitlab.config.uploads.object_store).to receive(:enabled) { true } end - it_behaves_like 'extracts base filename' - context 'when direct upload is enabled' do before do allow(Gitlab.config.uploads.object_store).to receive(:direct_upload) { true } |