Commit e7455c01 authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files

Merge branch '51318-project-export-broken-when-avatar-is-set' into 'master'

Resolve "Project export broken when avatar is set"

Closes #51318

See merge request gitlab-org/gitlab-ce!21649
......@@ -19,7 +19,7 @@ def move_to_cache
end
def absolute_path
self.class.absolute_path(model.avatar)
self.class.absolute_path(model.avatar.upload)
end
private
......
---
title: Fix broken exports when they include a projet avatar
merge_request: 21649
author:
type: fixed
......@@ -19,7 +19,7 @@ def restore
private
def avatar_export_file
@avatar_export_file ||= Dir["#{avatar_export_path}/**/*"].first
@avatar_export_file ||= Dir["#{avatar_export_path}/**/*"].find { |f| File.file?(f) }
end
def avatar_export_path
......
......@@ -6,22 +6,35 @@
let(:shared) { project.import_export_shared }
let(:project) { create(:project) }
before do
allow_any_instance_of(described_class).to receive(:avatar_export_file)
.and_return(uploaded_image_temp_path)
end
after do
project.remove_avatar!
end
it 'restores a project avatar' do
expect(described_class.new(project: project, shared: shared).restore).to be true
context 'with avatar' do
before do
allow_any_instance_of(described_class).to receive(:avatar_export_file)
.and_return(uploaded_image_temp_path)
end
it 'restores a project avatar' do
expect(described_class.new(project: project, shared: shared).restore).to be true
end
it 'saves the avatar into the project' do
described_class.new(project: project, shared: shared).restore
expect(project.reload.avatar.file.exists?).to be true
end
end
it 'saves the avatar into the project' do
described_class.new(project: project, shared: shared).restore
it 'does not break if there is just a directory' do
Dir.mktmpdir do |tmpdir|
FileUtils.mkdir_p("#{tmpdir}/a/b")
allow_any_instance_of(described_class).to receive(:avatar_export_path)
.and_return("#{tmpdir}/a")
expect(project.reload.avatar.file.exists?).to be true
expect(described_class.new(project: project, shared: shared).restore).to be true
end
end
end
......@@ -35,5 +35,13 @@
it_behaves_like "migrates", to_store: described_class::Store::REMOTE
it_behaves_like "migrates", from_store: described_class::Store::REMOTE, to_store: described_class::Store::LOCAL
it 'sets the right absolute path' do
storage_path = Gitlab.config.uploads.storage_path
absolute_path = File.join(storage_path, upload.path)
expect(uploader.absolute_path.scan(storage_path).size).to eq(1)
expect(uploader.absolute_path).to eq(absolute_path)
end
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment