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
28 lines
703 B
Ruby
28 lines
703 B
Ruby
require 'spec_helper'
|
|
|
|
describe AttachmentUploader do
|
|
let(:uploader) { described_class.new(build_stubbed(:user)) }
|
|
|
|
describe "#store_dir" do
|
|
it "stores in the system dir" do
|
|
expect(uploader.store_dir).to start_with("uploads/system/user")
|
|
end
|
|
|
|
it "uses the old path when using object storage" do
|
|
expect(described_class).to receive(:file_storage?).and_return(false)
|
|
expect(uploader.store_dir).to start_with("uploads/user")
|
|
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
|
|
end
|