Merge pull request #1917 from basecamp/dont-resize-svg-avatars

Don't try to resize non-variable avatars

test/controllers/users/avatars_controller_test.rb

@@ -32,7 +32,7 @@ class Users::AvatarsControllerTest < ActionDispatch::IntegrationTest
 
     get user_avatar_path(users(:david))
 
-    assert_redirected_to rails_blob_url(users(:david).avatar.variant(:thumb), disposition: "inline")
+    assert_redirected_to rails_blob_url(users(:david).avatar_thumbnail, disposition: "inline")
   end
 
   test "show other image redirects to the blob url" do
@@ -41,7 +41,7 @@ class Users::AvatarsControllerTest < ActionDispatch::IntegrationTest
 
     get user_avatar_path(users(:kevin))
 
-    assert_redirected_to rails_blob_url(users(:kevin).avatar.variant(:thumb), disposition: "inline")
+    assert_redirected_to rails_blob_url(users(:kevin).avatar_thumbnail, disposition: "inline")
   end
 
   test "delete self" do

test/fixtures/files/avatar.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100">
+  <circle cx="50" cy="50" r="40" fill="#4a90d9"/>
+</svg>

test/models/user/avatar_test.rb

@@ -0,0 +1,30 @@
+require "test_helper"
+
+class User::AvatarTest < ActiveSupport::TestCase
+  test "avatar_thumbnail returns variant for variable images" do
+    users(:david).avatar.attach(io: File.open(file_fixture("moon.jpg")), filename: "moon.jpg", content_type: "image/jpeg")
+
+    assert users(:david).avatar.variable?
+    assert_equal users(:david).avatar.variant(:thumb).blob, users(:david).avatar_thumbnail.blob
+  end
+
+  test "avatar_thumbnail returns original blob for non-variable images" do
+    users(:david).avatar.attach(io: File.open(file_fixture("avatar.svg")), filename: "avatar.svg", content_type: "image/svg+xml")
+
+    assert_not users(:david).avatar.variable?
+    assert_equal users(:david).avatar.blob, users(:david).avatar_thumbnail.blob
+  end
+
+  test "allows valid image content types" do
+    users(:david).avatar.attach(io: File.open(file_fixture("moon.jpg")), filename: "test.jpg")
+
+    assert users(:david).valid?
+  end
+
+  test "rejects SVG uploads" do
+    users(:david).avatar.attach(io: File.open(file_fixture("avatar.svg")), filename: "avatar.svg")
+
+    assert_not users(:david).valid?
+    assert_includes users(:david).errors[:avatar], "must be a JPEG, PNG, GIF, or WebP image"
+  end
+end