diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /spec/uploaders | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'spec/uploaders')
-rw-r--r-- | spec/uploaders/object_storage_spec.rb | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/spec/uploaders/object_storage_spec.rb b/spec/uploaders/object_storage_spec.rb index a1d8695a8c9..b454b0ad8f8 100644 --- a/spec/uploaders/object_storage_spec.rb +++ b/spec/uploaders/object_storage_spec.rb @@ -441,6 +441,22 @@ 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 @@ -502,6 +518,7 @@ 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 @@ -509,6 +526,8 @@ 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 } |