a1f44c1b49
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24550 fixed the case where the wrong path on disk was being searched, but it inadvertently ommitted the `/uploads/-/system` prefix when rendering the Markdown for personal snippet uploads when they were stored directly in object storage. A personal snippet path is stored using FileUploader#upload_path. The format for the path: Local storage: :random_hex/:filename. Object storage: personal_snippet/:id/:random_hex/:filename. upload_paths represent the possible paths for a given identifier, which will vary depending on whether the file is stored in local or object storage. upload_path should match an element in upload_paths. base_dir represents the path seen by the user in Markdown, and it should always be prefixed with uploads/-/system. store_dirs represent the paths that are actually used on disk. For object storage, this should omit the prefix /uploads/-/system. For example, consider the requested path /uploads/-/system/personal_snippet/172/ff4ad5c2/file.png. For local storage: base_dir: uploads/-/system/personal_snippet/172 upload_path: ff4ad5c2/file.png upload_paths: ["ff4ad5c2/file.png", "personal_snippet/172/ff4ad5c2/file.png"]. store_dirs: {1=>"uploads/-/system/personal_snippet/172/ff4ad5c2", 2=>"personal_snippet/172/ff4ad5c2"} For object storage: upload_path: personal_snippet/172/ff4ad5c2/file.png Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61671
82 lines
2.5 KiB
Ruby
82 lines
2.5 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe PersonalFileUploader do
|
|
let(:model) { create(:personal_snippet) }
|
|
let(:uploader) { described_class.new(model) }
|
|
let(:upload) { create(:upload, :personal_snippet_upload) }
|
|
|
|
subject { uploader }
|
|
|
|
shared_examples '#base_dir' do
|
|
before do
|
|
subject.instance_variable_set(:@secret, 'secret')
|
|
end
|
|
|
|
it 'is prefixed with uploads/-/system' do
|
|
allow(uploader).to receive(:file).and_return(double(extension: 'txt', filename: 'file_name'))
|
|
|
|
expect(described_class.base_dir(model)).to eq("uploads/-/system/personal_snippet/#{model.id}")
|
|
end
|
|
end
|
|
|
|
shared_examples '#to_h' do
|
|
before do
|
|
subject.instance_variable_set(:@secret, 'secret')
|
|
end
|
|
|
|
it 'is correct' do
|
|
allow(uploader).to receive(:file).and_return(double(extension: 'txt', filename: 'file_name'))
|
|
expected_url = "/uploads/-/system/personal_snippet/#{model.id}/secret/file_name"
|
|
|
|
expect(uploader.to_h).to eq(
|
|
alt: 'file_name',
|
|
url: expected_url,
|
|
markdown: "[file_name](#{expected_url})"
|
|
)
|
|
end
|
|
end
|
|
|
|
describe '#upload_paths' do
|
|
it 'builds correct paths for both local and remote storage' do
|
|
paths = uploader.upload_paths('test.jpg')
|
|
|
|
expect(paths.first).to match(%r[\h+\/test.jpg])
|
|
expect(paths.second).to match(%r[^personal_snippet\/\d+\/\h+\/test.jpg])
|
|
end
|
|
end
|
|
|
|
context 'object_store is LOCAL' do
|
|
it_behaves_like 'builds correct paths',
|
|
store_dir: %r[uploads/-/system/personal_snippet/\d+/\h+],
|
|
upload_path: %r[\h+/\S+],
|
|
absolute_path: %r[#{CarrierWave.root}/uploads/-/system/personal_snippet\/\d+\/\h+\/\S+$]
|
|
|
|
it_behaves_like '#base_dir'
|
|
it_behaves_like '#to_h'
|
|
end
|
|
|
|
context "object_store is REMOTE" do
|
|
before do
|
|
stub_uploads_object_storage
|
|
end
|
|
|
|
include_context 'with storage', described_class::Store::REMOTE
|
|
|
|
it_behaves_like 'builds correct paths',
|
|
store_dir: %r[\d+/\h+],
|
|
upload_path: %r[^personal_snippet\/\d+\/\h+\/<filename>]
|
|
|
|
it_behaves_like '#base_dir'
|
|
it_behaves_like '#to_h'
|
|
end
|
|
|
|
describe "#migrate!" do
|
|
before do
|
|
uploader.store!(fixture_file_upload('spec/fixtures/doc_sample.txt'))
|
|
stub_uploads_object_storage
|
|
end
|
|
|
|
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
|
|
end
|
|
end
|