github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 15:28:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Apply syntax_tree formatting to spec/*

Browse Source
This commit is contained in:
David Taylor
2023-01-09 11:18:21 +00:00
parent 0cf6421716
commit cb932d6ee1
907 changed files with 58693 additions and 45909 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
spec/models/optimized_image_spec.rb
View File

@ -4,8 +4,8 @@ RSpec.describe OptimizedImage do
let(:upload) { build(:upload) }
before { upload.id = 42 }
describe '.crop' do
it 'should produce cropped images (requires ImageMagick 7)' do
describe ".crop" do
it "should produce cropped images (requires ImageMagick 7)" do
tmp_path = "/tmp/cropped.png"
desired_width = 5
desired_height = 5
@ -15,7 +15,7 @@ RSpec.describe OptimizedImage do
"#{Rails.root}/spec/fixtures/images/logo.png",
tmp_path,
desired_width,
desired_height
desired_height,
)
w, h = FastImage.size(tmp_path)
@ -25,13 +25,12 @@ RSpec.describe OptimizedImage do
cropped_size = File.size(tmp_path)
expect(cropped_size).to be < 200
expect(cropped_size).to be > 50
ensure
File.delete(tmp_path) if File.exist?(tmp_path)
end
end
it 'should correctly crop images vertically' do
it "should correctly crop images vertically" do
tmp_path = "/tmp/cropped.png"
desired_width = 100
desired_height = 66
@ -41,20 +40,19 @@ RSpec.describe OptimizedImage do
"#{Rails.root}/spec/fixtures/images/logo.png", # 244x66px
tmp_path,
desired_width,
desired_height
desired_height,
)
w, h = FastImage.size(tmp_path)
expect(w).to eq(desired_width)
expect(h).to eq(desired_height)
ensure
File.delete(tmp_path) if File.exist?(tmp_path)
end
end
it 'should correctly crop images horizontally' do
it "should correctly crop images horizontally" do
tmp_path = "/tmp/cropped.png"
desired_width = 244
desired_height = 500
@ -64,14 +62,13 @@ RSpec.describe OptimizedImage do
"#{Rails.root}/spec/fixtures/images/logo.png", # 244x66px
tmp_path,
desired_width,
desired_height
desired_height,
)
w, h = FastImage.size(tmp_path)
expect(w).to eq(desired_width)
expect(h).to eq(desired_height)
ensure
File.delete(tmp_path) if File.exist?(tmp_path)
end
@ -82,20 +79,18 @@ RSpec.describe OptimizedImage do
it "doesn't return any color options by default" do
instructions = described_class.resize_instructions(image, image, "50x50")
expect(instructions).to_not include('-colors')
expect(instructions).to_not include("-colors")
end
it "supports an optional color option" do
instructions = described_class.resize_instructions(image, image, "50x50", colors: 12)
expect(instructions).to include('-colors')
expect(instructions).to include("-colors")
end
end
describe '.resize' do
it 'should work correctly when extension is bad' do
original_path = Dir::Tmpname.create(['origin', '.bin']) { nil }
describe ".resize" do
it "should work correctly when extension is bad" do
original_path = Dir::Tmpname.create(%w[origin .bin]) { nil }
begin
FileUtils.cp "#{Rails.root}/spec/fixtures/images/logo.png", original_path
@ -105,25 +100,17 @@ RSpec.describe OptimizedImage do
orig_size = File.size(original_path)
OptimizedImage.resize(
original_path,
original_path,
5,
5,
filename: "test.png"
)
OptimizedImage.resize(original_path, original_path, 5, 5, filename: "test.png")
new_size = File.size(original_path)
expect(orig_size).to be > new_size
expect(new_size).not_to eq(0)
ensure
File.delete(original_path) if File.exist?(original_path)
end
end
it 'should work correctly' do
it "should work correctly" do
file = File.open("#{Rails.root}/spec/fixtures/images/resized.png")
upload = UploadCreator.new(file, "test.bin").create_for(-1)
@ -154,8 +141,8 @@ RSpec.describe OptimizedImage do
expect(thumb.filesize).to be > 200
end
describe 'when an svg with a href is masked as a png' do
it 'should not trigger the external request' do
describe "when an svg with a href is masked as a png" do
it "should not trigger the external request" do
tmp_path = "/tmp/resized.png"
begin
@ -165,7 +152,7 @@ RSpec.describe OptimizedImage do
tmp_path,
5,
5,
raise_on_error: true
raise_on_error: true,
)
end.to raise_error(RuntimeError, /improper image header/)
ensure
@ -175,21 +162,20 @@ RSpec.describe OptimizedImage do
end
end
describe '.downsize' do
it 'should downsize logo (requires ImageMagick 7)' do
describe ".downsize" do
it "should downsize logo (requires ImageMagick 7)" do
tmp_path = "/tmp/downsized.png"
begin
OptimizedImage.downsize(
"#{Rails.root}/spec/fixtures/images/logo.png",
tmp_path,
"100x100\>"
"100x100\>",
)
info = FastImage.new(tmp_path)
expect(info.size).to eq([100, 27])
expect(File.size(tmp_path)).to be < 2300
ensure
File.delete(tmp_path) if File.exist?(tmp_path)
end
@ -198,7 +184,6 @@ RSpec.describe OptimizedImage do
end
describe ".safe_path?" do
it "correctly detects unsafe paths" do
expect(OptimizedImage.safe_path?("/path/A-AA/22_00.JPG")).to eq(true)
expect(OptimizedImage.safe_path?("/path/AAA/2200.JPG")).to eq(true)
@ -212,25 +197,21 @@ RSpec.describe OptimizedImage do
expect(OptimizedImage.safe_path?("/path/x.png y.png")).to eq(false)
expect(OptimizedImage.safe_path?(nil)).to eq(false)
end
end
describe "ensure_safe_paths!" do
it "raises nothing on safe paths" do
expect {
OptimizedImage.ensure_safe_paths!("/a.png", "/b.png")
}.not_to raise_error
expect { OptimizedImage.ensure_safe_paths!("/a.png", "/b.png") }.not_to raise_error
end
it "raises InvalidAccess error on paths" do
expect {
OptimizedImage.ensure_safe_paths!("/a.png", "/b.png", "c.png")
}.to raise_error(Discourse::InvalidAccess)
expect { OptimizedImage.ensure_safe_paths!("/a.png", "/b.png", "c.png") }.to raise_error(
Discourse::InvalidAccess,
)
end
end
describe ".local?" do
def local(url)
OptimizedImage.new(url: url).local?
end
@ -246,7 +227,7 @@ RSpec.describe OptimizedImage do
describe ".create_for" do
context "with versioning" do
let(:filename) { 'logo.png' }
let(:filename) { "logo.png" }
let(:file) { file_from_fixtures(filename) }
it "is able to update optimized images on version change" do
@ -275,14 +256,16 @@ RSpec.describe OptimizedImage do
# we don't really optimize anything, we simply copy
# but at least this confirms this actually works
SiteSetting.authorized_extensions = 'svg'
svg = file_from_fixtures('image.svg')
upload = UploadCreator.new(svg, 'image.svg').create_for(Discourse.system_user.id)
SiteSetting.authorized_extensions = "svg"
svg = file_from_fixtures("image.svg")
upload = UploadCreator.new(svg, "image.svg").create_for(Discourse.system_user.id)
resized = upload.get_optimized_image(50, 50, {})
# we perform some basic svg mangling but expect the string Discourse to be there
expect(File.read(Discourse.store.path_for(resized))).to include("Discourse")
expect(File.read(Discourse.store.path_for(resized))).to eq(File.read(Discourse.store.path_for(upload)))
expect(File.read(Discourse.store.path_for(resized))).to eq(
File.read(Discourse.store.path_for(upload)),
)
end
context "when using an internal store" do
@ -290,7 +273,6 @@ RSpec.describe OptimizedImage do
before { Discourse.stubs(:store).returns(store) }
context "when an error happened while generating the thumbnail" do
it "returns nil" do
OptimizedImage.expects(:resize).returns(false)
expect(OptimizedImage.create_for(upload, 100, 200)).to eq(nil)
@ -298,9 +280,7 @@ RSpec.describe OptimizedImage do
end
context "when the thumbnail is properly generated" do
before do
OptimizedImage.expects(:resize).returns(true)
end
before { OptimizedImage.expects(:resize).returns(true) }
it "does not download a copy of the original image" do
store.expects(:download).never
@ -322,16 +302,14 @@ RSpec.describe OptimizedImage do
end
it "is able to change the format" do
oi = OptimizedImage.create_for(upload, 100, 200, format: 'gif')
oi = OptimizedImage.create_for(upload, 100, 200, format: "gif")
expect(oi.url).to eq("/internally/stored/optimized/image.gif")
end
end
end
describe "external store" do
before do
setup_s3
end
before { setup_s3 }
context "when we have a bad file returned" do
it "returns nil" do
@ -350,9 +328,14 @@ RSpec.describe OptimizedImage do
before do
stub_request(:head, "http://#{s3_upload.url}").to_return(status: 200)
stub_request(:get, "http://#{s3_upload.url}").to_return(status: 200, body: file_from_fixtures("logo.png"))
stub_request(:put, %r{https://#{SiteSetting.s3_upload_bucket}\.s3\.#{SiteSetting.s3_region}\.amazonaws.com#{optimized_path}})
.to_return(status: 200, headers: { "ETag" => "someetag" })
stub_request(:get, "http://#{s3_upload.url}").to_return(
status: 200,
body: file_from_fixtures("logo.png"),
)
stub_request(
:put,
%r{https://#{SiteSetting.s3_upload_bucket}\.s3\.#{SiteSetting.s3_region}\.amazonaws.com#{optimized_path}},
).to_return(status: 200, headers: { "ETag" => "someetag" })
end
it "downloads a copy of the original image" do
@ -362,7 +345,9 @@ RSpec.describe OptimizedImage do
expect(oi.extension).to eq(".png")
expect(oi.width).to eq(100)
expect(oi.height).to eq(200)
expect(oi.url).to match(%r{//#{SiteSetting.s3_upload_bucket}\.s3\.dualstack\.us-west-1\.amazonaws\.com#{optimized_path}})
expect(oi.url).to match(
%r{//#{SiteSetting.s3_upload_bucket}\.s3\.dualstack\.us-west-1\.amazonaws\.com#{optimized_path}},
)
expect(oi.filesize).to be > 0
oi.filesize = nil
@ -379,9 +364,9 @@ RSpec.describe OptimizedImage do
end
end
describe '#destroy' do
describe 'when upload_id is no longer valid' do
it 'should still destroy the record' do
describe "#destroy" do
describe "when upload_id is no longer valid" do
it "should still destroy the record" do
image = Fabricate(:optimized_image)
image.upload.delete
image.reload.destroy
@ -393,7 +378,6 @@ RSpec.describe OptimizedImage do
end
class FakeInternalStore
def external?
false
end
@ -405,5 +389,4 @@ class FakeInternalStore
def store_optimized_image(file, optimized_image, content_type = nil, secure: false)
"/internally/stored/optimized/image#{optimized_image.extension}"
end
end