From a09983ae35713f5a2bbb100981116d31ce99826e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 20 Jul 2020 12:26:25 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-2-stable-ee --- spec/uploaders/attachment_uploader_spec.rb | 2 +- spec/uploaders/avatar_uploader_spec.rb | 2 +- spec/uploaders/content_type_whitelist_spec.rb | 2 +- .../design_v432x230_uploader_spec.rb | 2 +- spec/uploaders/external_diff_uploader_spec.rb | 2 +- spec/uploaders/favicon_uploader_spec.rb | 2 +- spec/uploaders/file_mover_spec.rb | 2 +- spec/uploaders/file_uploader_spec.rb | 2 +- spec/uploaders/gitlab_uploader_spec.rb | 2 +- spec/uploaders/import_export_uploader_spec.rb | 2 +- spec/uploaders/job_artifact_uploader_spec.rb | 2 +- spec/uploaders/lfs_object_uploader_spec.rb | 2 +- spec/uploaders/namespace_file_uploader_spec.rb | 2 +- spec/uploaders/object_storage_spec.rb | 2 +- .../packages/package_file_uploader_spec.rb | 45 ++++++++++++++++++++++ spec/uploaders/personal_file_uploader_spec.rb | 2 +- spec/uploaders/records_uploads_spec.rb | 2 +- spec/uploaders/terraform/state_uploader_spec.rb | 2 +- spec/uploaders/uploader_helper_spec.rb | 2 +- .../object_storage/background_move_worker_spec.rb | 2 +- .../object_storage/migrate_uploads_worker_spec.rb | 2 +- 21 files changed, 65 insertions(+), 20 deletions(-) create mode 100644 spec/uploaders/packages/package_file_uploader_spec.rb (limited to 'spec/uploaders') diff --git a/spec/uploaders/attachment_uploader_spec.rb b/spec/uploaders/attachment_uploader_spec.rb index d5a92b9b317..05cffff1f1a 100644 --- a/spec/uploaders/attachment_uploader_spec.rb +++ b/spec/uploaders/attachment_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe AttachmentUploader do +RSpec.describe AttachmentUploader do let(:note) { create(:note, :with_attachment) } let(:uploader) { note.attachment } let(:upload) { create(:upload, :attachment_upload, model: uploader.model) } diff --git a/spec/uploaders/avatar_uploader_spec.rb b/spec/uploaders/avatar_uploader_spec.rb index 142ee557afa..1fadd9425ef 100644 --- a/spec/uploaders/avatar_uploader_spec.rb +++ b/spec/uploaders/avatar_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe AvatarUploader do +RSpec.describe AvatarUploader do let(:model) { build_stubbed(:user) } let(:uploader) { described_class.new(model, :avatar) } let(:upload) { create(:upload, model: model) } diff --git a/spec/uploaders/content_type_whitelist_spec.rb b/spec/uploaders/content_type_whitelist_spec.rb index 32d030cdfee..cf7463369ab 100644 --- a/spec/uploaders/content_type_whitelist_spec.rb +++ b/spec/uploaders/content_type_whitelist_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ContentTypeWhitelist do +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/design_management/design_v432x230_uploader_spec.rb b/spec/uploaders/design_management/design_v432x230_uploader_spec.rb index 8c62b6ad6a8..b3a106ef94b 100644 --- a/spec/uploaders/design_management/design_v432x230_uploader_spec.rb +++ b/spec/uploaders/design_management/design_v432x230_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe DesignManagement::DesignV432x230Uploader do +RSpec.describe DesignManagement::DesignV432x230Uploader do include CarrierWave::Test::Matchers let(:model) { create(:design_action, :with_image_v432x230) } diff --git a/spec/uploaders/external_diff_uploader_spec.rb b/spec/uploaders/external_diff_uploader_spec.rb index ee11085d54e..ee23c1e36b7 100644 --- a/spec/uploaders/external_diff_uploader_spec.rb +++ b/spec/uploaders/external_diff_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ExternalDiffUploader do +RSpec.describe ExternalDiffUploader do let(:diff) { create(:merge_request).merge_request_diff } let(:path) { Gitlab.config.external_diffs.storage_path } diff --git a/spec/uploaders/favicon_uploader_spec.rb b/spec/uploaders/favicon_uploader_spec.rb index 0f5941b3f0a..6bff3ff8a14 100644 --- a/spec/uploaders/favicon_uploader_spec.rb +++ b/spec/uploaders/favicon_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe FaviconUploader do +RSpec.describe FaviconUploader do let_it_be(:model) { build_stubbed(:user) } let_it_be(:uploader) { described_class.new(model, :favicon) } diff --git a/spec/uploaders/file_mover_spec.rb b/spec/uploaders/file_mover_spec.rb index 474515b537c..0f7496f17d5 100644 --- a/spec/uploaders/file_mover_spec.rb +++ b/spec/uploaders/file_mover_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe FileMover do +RSpec.describe FileMover do include FileMoverHelpers let(:user) { create(:user) } diff --git a/spec/uploaders/file_uploader_spec.rb b/spec/uploaders/file_uploader_spec.rb index 629c84778b9..9f1d276d092 100644 --- a/spec/uploaders/file_uploader_spec.rb +++ b/spec/uploaders/file_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe FileUploader do +RSpec.describe FileUploader do let(:group) { create(:group, name: 'awesome') } let(:project) { create(:project, :legacy_storage, namespace: group, name: 'project') } let(:uploader) { described_class.new(project, :avatar) } diff --git a/spec/uploaders/gitlab_uploader_spec.rb b/spec/uploaders/gitlab_uploader_spec.rb index 80efdb88585..72845b47a53 100644 --- a/spec/uploaders/gitlab_uploader_spec.rb +++ b/spec/uploaders/gitlab_uploader_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require 'carrierwave/storage/fog' -describe GitlabUploader do +RSpec.describe GitlabUploader do let(:uploader_class) { Class.new(described_class) } subject { uploader_class.new(double) } diff --git a/spec/uploaders/import_export_uploader_spec.rb b/spec/uploaders/import_export_uploader_spec.rb index 33cab911f86..b1fdcf067c6 100644 --- a/spec/uploaders/import_export_uploader_spec.rb +++ b/spec/uploaders/import_export_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ImportExportUploader do +RSpec.describe ImportExportUploader do let(:model) { build_stubbed(:import_export_upload) } let(:upload) { create(:upload, model: model) } let(:import_export_upload) { ImportExportUpload.new } diff --git a/spec/uploaders/job_artifact_uploader_spec.rb b/spec/uploaders/job_artifact_uploader_spec.rb index a03cf3b9dea..9ccf216d1fc 100644 --- a/spec/uploaders/job_artifact_uploader_spec.rb +++ b/spec/uploaders/job_artifact_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe JobArtifactUploader do +RSpec.describe JobArtifactUploader do let(:store) { described_class::Store::LOCAL } let(:job_artifact) { create(:ci_job_artifact, file_store: store) } let(:uploader) { described_class.new(job_artifact, :file) } diff --git a/spec/uploaders/lfs_object_uploader_spec.rb b/spec/uploaders/lfs_object_uploader_spec.rb index 1041e13d34f..d1a3fb243ac 100644 --- a/spec/uploaders/lfs_object_uploader_spec.rb +++ b/spec/uploaders/lfs_object_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe LfsObjectUploader do +RSpec.describe LfsObjectUploader do let(:lfs_object) { create(:lfs_object, :with_file) } let(:uploader) { described_class.new(lfs_object, :file) } let(:path) { Gitlab.config.lfs.storage_path } diff --git a/spec/uploaders/namespace_file_uploader_spec.rb b/spec/uploaders/namespace_file_uploader_spec.rb index bc8d6a33e85..99bf4e130f2 100644 --- a/spec/uploaders/namespace_file_uploader_spec.rb +++ b/spec/uploaders/namespace_file_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe NamespaceFileUploader do +RSpec.describe NamespaceFileUploader do let(:group) { build_stubbed(:group) } let(:uploader) { described_class.new(group) } let(:upload) { create(:upload, :namespace_upload, model: group) } diff --git a/spec/uploaders/object_storage_spec.rb b/spec/uploaders/object_storage_spec.rb index f42d581ece4..694aafe5ed5 100644 --- a/spec/uploaders/object_storage_spec.rb +++ b/spec/uploaders/object_storage_spec.rb @@ -18,7 +18,7 @@ class Implementation < GitlabUploader end end -describe ObjectStorage do +RSpec.describe ObjectStorage do let(:uploader_class) { Implementation } let(:object) { build_stubbed(:user) } let(:uploader) { uploader_class.new(object, :file) } diff --git a/spec/uploaders/packages/package_file_uploader_spec.rb b/spec/uploaders/packages/package_file_uploader_spec.rb new file mode 100644 index 00000000000..1fe65649d7a --- /dev/null +++ b/spec/uploaders/packages/package_file_uploader_spec.rb @@ -0,0 +1,45 @@ +# frozen_string_literal: true +require 'spec_helper' + +RSpec.describe Packages::PackageFileUploader do + let(:package_file) { create(:package_file, :xml) } + let(:uploader) { described_class.new(package_file, :file) } + let(:path) { Gitlab.config.packages.storage_path } + + subject { uploader } + + it_behaves_like "builds correct paths", + store_dir: %r[\h{2}/\h{2}], + cache_dir: %r[/packages/tmp/cache], + work_dir: %r[/packages/tmp/work] + + context 'object store is remote' do + before do + stub_packages_object_storage + end + + include_context 'with storage', described_class::Store::REMOTE + + it_behaves_like "builds correct paths", + store_dir: %r[\h{2}/\h{2}] + end + + describe 'remote file' do + let(:package_file) { create(:package_file, :object_storage, :xml) } + + context 'with object storage enabled' do + before do + stub_packages_object_storage + end + + it 'can store file remotely' do + allow(ObjectStorage::BackgroundMoveWorker).to receive(:perform_async) + + package_file + + expect(package_file.file_store).to eq(described_class::Store::REMOTE) + expect(package_file.file.path).not_to be_blank + end + end + end +end diff --git a/spec/uploaders/personal_file_uploader_spec.rb b/spec/uploaders/personal_file_uploader_spec.rb index c211ec3607c..d2eae5d7a54 100644 --- a/spec/uploaders/personal_file_uploader_spec.rb +++ b/spec/uploaders/personal_file_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PersonalFileUploader do +RSpec.describe PersonalFileUploader do let(:model) { create(:personal_snippet) } let(:uploader) { described_class.new(model) } let(:upload) { create(:upload, :personal_snippet_upload) } diff --git a/spec/uploaders/records_uploads_spec.rb b/spec/uploaders/records_uploads_spec.rb index 1a3c416c74a..c1f5f962d77 100644 --- a/spec/uploaders/records_uploads_spec.rb +++ b/spec/uploaders/records_uploads_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe RecordsUploads do +RSpec.describe RecordsUploads do let!(:uploader) do stub_const('RecordsUploadsExampleUploader', Class.new(GitlabUploader)) diff --git a/spec/uploaders/terraform/state_uploader_spec.rb b/spec/uploaders/terraform/state_uploader_spec.rb index cbcb6298eca..dadfdf6e93f 100644 --- a/spec/uploaders/terraform/state_uploader_spec.rb +++ b/spec/uploaders/terraform/state_uploader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Terraform::StateUploader do +RSpec.describe Terraform::StateUploader do subject { terraform_state.file } let(:terraform_state) { create(:terraform_state, :with_file) } diff --git a/spec/uploaders/uploader_helper_spec.rb b/spec/uploaders/uploader_helper_spec.rb index 7bc6caf8224..e62e9b3c14b 100644 --- a/spec/uploaders/uploader_helper_spec.rb +++ b/spec/uploaders/uploader_helper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe UploaderHelper do +RSpec.describe UploaderHelper do let(:uploader) do example_uploader = Class.new(CarrierWave::Uploader::Base) do include UploaderHelper diff --git a/spec/uploaders/workers/object_storage/background_move_worker_spec.rb b/spec/uploaders/workers/object_storage/background_move_worker_spec.rb index 38b70d33993..a481939ed7a 100644 --- a/spec/uploaders/workers/object_storage/background_move_worker_spec.rb +++ b/spec/uploaders/workers/object_storage/background_move_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ObjectStorage::BackgroundMoveWorker do +RSpec.describe ObjectStorage::BackgroundMoveWorker do let(:local) { ObjectStorage::Store::LOCAL } let(:remote) { ObjectStorage::Store::REMOTE } diff --git a/spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb b/spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb index 7bf8512a6fd..ef5459ce788 100644 --- a/spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb +++ b/spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ObjectStorage::MigrateUploadsWorker do +RSpec.describe ObjectStorage::MigrateUploadsWorker do let(:model_class) { Project } let(:uploads) { Upload.all } let(:to_store) { ObjectStorage::Store::REMOTE } -- cgit v1.2.3