X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bd1420a7c51b7d1c3a64bc02756393c7ad2025f5..d29807d715d3d493f8af631c9631feeb702912e1:/test/helpers/user_helper_test.rb?ds=inline diff --git a/test/helpers/user_helper_test.rb b/test/helpers/user_helper_test.rb index 340d2494d..11a47a195 100644 --- a/test/helpers/user_helper_test.rb +++ b/test/helpers/user_helper_test.rb @@ -8,13 +8,12 @@ class UserHelperTest < ActionView::TestCase gravatar_user = create(:user, :image_use_gravatar => true) image = user_image(user) - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_image(user, :class => "foo") assert_match %r{^$}, image - image = user_image(gravatar_user) - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_image(gravatar_user, :class => "foo") assert_match %r{^$}, image @@ -25,13 +24,13 @@ class UserHelperTest < ActionView::TestCase gravatar_user = create(:user, :image_use_gravatar => true) image = user_thumbnail(user) - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_thumbnail(user, :class => "foo") assert_match %r{^$}, image image = user_thumbnail(gravatar_user) - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_thumbnail(gravatar_user, :class => "foo") assert_match %r{^$}, image @@ -42,13 +41,13 @@ class UserHelperTest < ActionView::TestCase gravatar_user = create(:user, :image_use_gravatar => true) image = user_thumbnail_tiny(user) - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_thumbnail_tiny(user, :class => "foo") assert_match %r{^$}, image image = user_thumbnail_tiny(gravatar_user) - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_thumbnail_tiny(gravatar_user, :class => "foo") assert_match %r{^$}, image @@ -60,12 +59,56 @@ class UserHelperTest < ActionView::TestCase gravatar_user = create(:user, :image_use_gravatar => true) url = user_image_url(user) - assert_match %r{^http://test.host/rails/active_storage/representations/[^/]+/[^/]+/a.gif$}, url + assert_match %r{^http://test.host/rails/active_storage/representations/redirect/[^/]+/[^/]+/a.gif$}, url url = user_image_url(gravatar_user) assert_match %r{^http://www.gravatar.com/avatar/}, url end + def test_user_image_sizes_default_image + user = create(:user) + + image = user_image(user) + assert_match %r{^$}, image + + thumbnail = user_thumbnail(user) + assert_match %r{^$}, thumbnail + end + + def test_user_image_sizes_avatar + user = create(:user) + user.avatar.attach(:io => File.open("test/gpx/fixtures/a.gif"), :filename => "a.gif") + + # first time access, no width or height is found + image = user_image(user) + assert_no_match %r{^$}, image + + thumbnail = user_thumbnail(user) + assert_no_match %r{^$}, thumbnail + + # Small hacks to simulate what happens when the images have been fetched at least once before + variant = user.avatar.variant(:resize_to_limit => [100, 100]) + variant.processed.send(:record).image.blob.analyze + variant = user.avatar.variant(:resize_to_limit => [50, 50]) + variant.processed.send(:record).image.blob.analyze + + image = user_image(user) + assert_match %r{^$}, image + + thumbnail = user_thumbnail(user) + assert_match %r{^$}, thumbnail + end + + def test_user_image_sizes_gravatar + user = create(:user, :image_use_gravatar => true) + + image = user_image(user) + assert_match %r{^$}, image + + thumbnail = user_thumbnail(user) + assert_match %r{^$}, thumbnail + end + def test_openid_logo logo = openid_logo assert_match %r{^$}, logo @@ -73,10 +116,10 @@ class UserHelperTest < ActionView::TestCase def test_auth_button button = auth_button("google", "google") - assert_equal("\"Login", button) + assert_equal("\"Login", button) - button = auth_button("yahoo", "openid", :openid_url => "yahoo.com") - assert_equal("\"Login", button) + button = auth_button("wordpress", "openid", :openid_url => "wordpress.com") + assert_equal("\"Login", button) end private