mirror of
https://github.com/discourse/discourse.git
synced 2024-12-14 01:38:24 +08:00
dba6a5eabf
The file size error messages for max_image_size_kb and max_attachment_size_kb are shown to the user in the KB format, regardless of how large the limit is. Since we are going to support uploading much larger files soon, this KB-based limit soon becomes unfriendly to the end user. For example, if the max attachment size is set to 512000 KB, this is what the user sees: > Sorry, the file you are trying to upload is too big (maximum size is 512000KB) This makes the user do math. In almost all file explorers that a regular user would be familiar width, the file size is shown in a format based on the maximum increment (e.g. KB, MB, GB). This commit changes the behaviour to output a humanized file size instead of the raw KB. For the above example, it would now say: > Sorry, the file you are trying to upload is too big (maximum size is 512 MB) This humanization also handles decimals, e.g. 1536KB = 1.5 MB
111 lines
3.2 KiB
Ruby
111 lines
3.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe UploadValidator do
|
|
subject(:validator) { described_class.new }
|
|
|
|
describe 'validate' do
|
|
fab!(:user) { Fabricate(:user) }
|
|
let(:filename) { "discourse.csv" }
|
|
let(:csv_file) { file_from_fixtures(filename, "csv") }
|
|
|
|
it "should create an invalid upload when the filename is blank" do
|
|
SiteSetting.authorized_extensions = "*"
|
|
created_upload = UploadCreator.new(csv_file, nil).create_for(user.id)
|
|
validator.validate(created_upload)
|
|
expect(created_upload).to_not be_valid
|
|
expect(created_upload.errors.full_messages.first).to include(I18n.t("activerecord.errors.messages.blank"))
|
|
end
|
|
|
|
it "allows 'gz' as extension when uploading export file" do
|
|
SiteSetting.authorized_extensions = ""
|
|
|
|
expect(UploadCreator.new(csv_file, "#{filename}.zip", for_export: true).create_for(user.id)).to be_valid
|
|
end
|
|
|
|
it "allows uses max_export_file_size_kb when uploading export file" do
|
|
SiteSetting.max_attachment_size_kb = "0"
|
|
SiteSetting.authorized_extensions = "zip"
|
|
|
|
expect(UploadCreator.new(csv_file, "#{filename}.zip", for_export: true).create_for(user.id)).to be_valid
|
|
end
|
|
|
|
describe "size validation" do
|
|
it "does not allow images that are too large" do
|
|
SiteSetting.max_image_size_kb = 1536
|
|
upload = Fabricate.build(:upload,
|
|
user: Fabricate(:admin),
|
|
original_filename: "test.png",
|
|
filesize: 2097152
|
|
)
|
|
subject.validate(upload)
|
|
expect(upload.errors.full_messages.first).to eq(
|
|
"Filesize #{I18n.t("upload.images.too_large_humanized", max_size: "1.5 MB")}"
|
|
)
|
|
end
|
|
end
|
|
|
|
describe 'when allow_staff_to_upload_any_file_in_pm is true' do
|
|
it 'should allow uploads for pm' do
|
|
upload = Fabricate.build(:upload,
|
|
user: Fabricate(:admin),
|
|
original_filename: 'test.ico',
|
|
for_private_message: true
|
|
)
|
|
|
|
expect(subject.validate(upload)).to eq(true)
|
|
end
|
|
|
|
describe 'for a normal user' do
|
|
it 'should not allow uploads for pm' do
|
|
upload = Fabricate.build(:upload,
|
|
user: Fabricate(:user),
|
|
original_filename: 'test.ico',
|
|
for_private_message: true
|
|
)
|
|
|
|
expect(subject.validate(upload)).to eq(nil)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'upload for site settings' do
|
|
fab!(:user) { Fabricate(:admin) }
|
|
|
|
let(:upload) do
|
|
Fabricate.build(:upload,
|
|
user: user,
|
|
original_filename: 'test.ico',
|
|
for_site_setting: true
|
|
)
|
|
end
|
|
|
|
before do
|
|
SiteSetting.authorized_extensions = 'png'
|
|
end
|
|
|
|
describe 'for admin user' do
|
|
it 'should allow the upload' do
|
|
expect(subject.validate(upload)).to eq(true)
|
|
end
|
|
|
|
describe 'when filename is invalid' do
|
|
it 'should not allow the upload' do
|
|
upload.original_filename = 'test.txt'
|
|
expect(subject.validate(upload)).to eq(nil)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'for normal user' do
|
|
fab!(:user) { Fabricate(:user) }
|
|
|
|
it 'should not allow the upload' do
|
|
expect(subject.validate(upload)).to eq(nil)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|