tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream

Browse Source 
Merge upstream changes right before the public profile redesign.
This commit is contained in:
Thibaut Girka
2018-07-30 14:39:06 +02:00
parent b02bfe86ce e23b26178a
commit 5f1bdca4c8
6 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spec/models/media_attachment_spec.rb
View File

@@ -129,9 +129,9 @@ RSpec.describe MediaAttachment, type: :model do
expect(media.file.meta["original"]["width"]).to eq 600
expect(media.file.meta["original"]["height"]).to eq 400
expect(media.file.meta["original"]["aspect"]).to eq 1.5
expect(media.file.meta["small"]["width"]).to eq 400
expect(media.file.meta["small"]["height"]).to eq 267
expect(media.file.meta["small"]["aspect"]).to eq 400.0/267
expect(media.file.meta["small"]["width"]).to eq 490
expect(media.file.meta["small"]["height"]).to eq 327
expect(media.file.meta["small"]["aspect"]).to eq 490.0/327
end
end