diff options
| -rw-r--r-- | lib/gitlab/uploads_transfer.rb | 2 | ||||
| -rw-r--r-- | spec/factories/projects.rb | 4 | ||||
| -rw-r--r-- | spec/lib/gitlab/uploads_transfer_spec.rb | 11 | ||||
| -rw-r--r-- | spec/models/namespace_spec.rb | 2 |
4 files changed, 17 insertions, 2 deletions
diff --git a/lib/gitlab/uploads_transfer.rb b/lib/gitlab/uploads_transfer.rb index 7d0c47c5361..b5f41240529 100644 --- a/lib/gitlab/uploads_transfer.rb +++ b/lib/gitlab/uploads_transfer.rb @@ -1,7 +1,7 @@ module Gitlab class UploadsTransfer < ProjectTransfer def root_dir - File.join(CarrierWave.root, GitlabUploader.base_dir) + File.join(CarrierWave.root, FileUploader.base_dir) end end end diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb index c6f91e05d83..7af8dbe1a5b 100644 --- a/spec/factories/projects.rb +++ b/spec/factories/projects.rb @@ -32,6 +32,10 @@ FactoryGirl.define do request_access_enabled true end + trait :with_avatar do + avatar { File.open(Rails.root.join('spec/fixtures/dk.png')) } + end + trait :repository do # no-op... for now! end diff --git a/spec/lib/gitlab/uploads_transfer_spec.rb b/spec/lib/gitlab/uploads_transfer_spec.rb new file mode 100644 index 00000000000..109559bb01c --- /dev/null +++ b/spec/lib/gitlab/uploads_transfer_spec.rb @@ -0,0 +1,11 @@ +require 'spec_helper' + +describe Gitlab::UploadsTransfer do + it 'leaves avatar uploads where they are' do + project_with_avatar = create(:empty_project, :with_avatar) + + described_class.new.rename_namespace('project', 'project-renamed') + + expect(File.exist?(project_with_avatar.avatar.path)).to be_truthy + end +end diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb index 41bc51114b3..491c7bdcd9b 100644 --- a/spec/models/namespace_spec.rb +++ b/spec/models/namespace_spec.rb @@ -172,7 +172,7 @@ describe Namespace, models: true do let(:parent) { create(:group, name: 'parent', path: 'parent') } let(:child) { create(:group, name: 'child', path: 'child', parent: parent) } let!(:project) { create(:project_empty_repo, path: 'the-project', namespace: child) } - let(:uploads_dir) { File.join(CarrierWave.root, 'uploads', 'system', 'parent') } + let(:uploads_dir) { File.join(CarrierWave.root, FileUploader.base_dir, 'parent') } let(:pages_dir) { File.join(TestEnv.pages_path, 'parent') } before do |