diff options
author | Sean McGivern <sean@gitlab.com> | 2017-06-01 15:32:01 +0300 |
---|---|---|
committer | Regis <boudinot.regis@yahoo.com> | 2017-06-02 22:23:55 +0300 |
commit | 883d27144d0a0a62c1e1a5f9f7f36f357632b17d (patch) | |
tree | fbab9ce95bc9cd2f974a8b6ddd13281c8111ff8e /spec | |
parent | e90079d59983330ea6ee377b6c55f2ff3c95bb50 (diff) |
Merge branch 'bvl-move-project-uploads-correctly' into 'security-9-2'
Move the uploads in the correct folder when moving project/namespace
See merge request !2112
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/uploads_transfer_spec.rb | 11 | ||||
-rw-r--r-- | spec/models/namespace_spec.rb | 2 |
2 files changed, 12 insertions, 1 deletions
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 5fc43eab283..60ba8858df2 100644 --- a/spec/models/namespace_spec.rb +++ b/spec/models/namespace_spec.rb @@ -184,7 +184,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, GitlabUploader.base_dir) } + let(:uploads_dir) { File.join(CarrierWave.root, FileUploader.base_dir) } let(:pages_dir) { File.join(TestEnv.pages_path) } before do |