diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /spec/uploaders | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
download | gitlab-ce-e8d2c2579383897a1dd7f9debd359abe8ae8373d.tar.gz |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'spec/uploaders')
-rw-r--r-- | spec/uploaders/content_type_whitelist_spec.rb | 1 | ||||
-rw-r--r-- | spec/uploaders/dependency_proxy/file_uploader_spec.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/spec/uploaders/content_type_whitelist_spec.rb b/spec/uploaders/content_type_whitelist_spec.rb index cf7463369ab..0cafc7a3ae2 100644 --- a/spec/uploaders/content_type_whitelist_spec.rb +++ b/spec/uploaders/content_type_whitelist_spec.rb @@ -4,6 +4,7 @@ require 'spec_helper' RSpec.describe ContentTypeWhitelist do let_it_be(:model) { build_stubbed(:user) } + let!(:uploader) do stub_const('DummyUploader', Class.new(CarrierWave::Uploader::Base)) diff --git a/spec/uploaders/dependency_proxy/file_uploader_spec.rb b/spec/uploaders/dependency_proxy/file_uploader_spec.rb index 6e94a661d6d..eb12e7dffa5 100644 --- a/spec/uploaders/dependency_proxy/file_uploader_spec.rb +++ b/spec/uploaders/dependency_proxy/file_uploader_spec.rb @@ -5,6 +5,7 @@ RSpec.describe DependencyProxy::FileUploader do describe 'DependencyProxy::Blob uploader' do let_it_be(:blob) { create(:dependency_proxy_blob) } let_it_be(:path) { Gitlab.config.dependency_proxy.storage_path } + let(:uploader) { described_class.new(blob, :file) } subject { uploader } @@ -30,6 +31,7 @@ RSpec.describe DependencyProxy::FileUploader do let_it_be(:manifest) { create(:dependency_proxy_manifest) } let_it_be(:initial_content_type) { 'application/json' } let_it_be(:fixture_file) { fixture_file_upload('spec/fixtures/dependency_proxy/manifest', initial_content_type) } + let(:uploader) { described_class.new(manifest, :file) } subject { uploader } |