1d1363e2bb
Ran: - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch - git checkout -b 9-2-5-security-patch origin/v9.2.2 - git apply patchfile.patch - git commit - [Got the sha ref for the commit] - git checkout -b upstream-9-2-security master - git cherry-pick <SHA of the patchfile commit> - [Resolved conflicts] - git cherry-pick --continue
66 lines
1.8 KiB
Ruby
66 lines
1.8 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe FileUploader do
|
|
let(:uploader) { described_class.new(build_stubbed(:empty_project)) }
|
|
|
|
describe '.absolute_path' do
|
|
it 'returns the correct absolute path by building it dynamically' do
|
|
project = build_stubbed(:project)
|
|
upload = double(model: project, path: 'secret/foo.jpg')
|
|
|
|
dynamic_segment = project.path_with_namespace
|
|
|
|
expect(described_class.absolute_path(upload))
|
|
.to end_with("#{dynamic_segment}/secret/foo.jpg")
|
|
end
|
|
end
|
|
|
|
describe "#store_dir" do
|
|
it "stores in the namespace path" do
|
|
project = build_stubbed(:empty_project)
|
|
uploader = described_class.new(project)
|
|
|
|
expect(uploader.store_dir).to include(project.path_with_namespace)
|
|
expect(uploader.store_dir).not_to include("system")
|
|
end
|
|
end
|
|
|
|
describe 'initialize' do
|
|
it 'generates a secret if none is provided' do
|
|
expect(SecureRandom).to receive(:hex).and_return('secret')
|
|
|
|
uploader = described_class.new(double)
|
|
|
|
expect(uploader.secret).to eq 'secret'
|
|
end
|
|
|
|
it 'accepts a secret parameter' do
|
|
expect(SecureRandom).not_to receive(:hex)
|
|
|
|
uploader = described_class.new(double, 'secret')
|
|
|
|
expect(uploader.secret).to eq 'secret'
|
|
end
|
|
end
|
|
|
|
describe '#move_to_cache' do
|
|
it 'is true' do
|
|
expect(uploader.move_to_cache).to eq(true)
|
|
end
|
|
end
|
|
|
|
describe '#move_to_store' do
|
|
it 'is true' do
|
|
expect(uploader.move_to_store).to eq(true)
|
|
end
|
|
end
|
|
|
|
describe '#relative_path' do
|
|
it 'removes the leading dynamic path segment' do
|
|
fixture = Rails.root.join('spec', 'fixtures', 'rails_sample.jpg')
|
|
uploader.store!(fixture_file_upload(fixture))
|
|
|
|
expect(uploader.relative_path).to match(/\A\h{32}\/rails_sample.jpg\z/)
|
|
end
|
|
end
|
|
end
|