X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c162c065c6f6db5dc584599f5639b296b627a165..317b1871f48db1da4abd315c3e67edb910af6b57:/test/helpers/user_helper_test.rb?ds=sidebyside
diff --git a/test/helpers/user_helper_test.rb b/test/helpers/user_helper_test.rb
index 0fcbc3d90..cb7125cca 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,29 +41,74 @@ 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
end
def test_user_image_url
- user = create(:user, :image_file_name => "test.jpg", :image_fingerprint => "d41d8cd98f00b204e9800998ecf8427e")
+ user = create(:user)
+ user.avatar.attach(:io => File.open("test/gpx/fixtures/a.gif"), :filename => "a.gif")
gravatar_user = create(:user, :image_use_gravatar => true)
url = user_image_url(user)
- assert_match %r{^/attachments/users/images/\d{3}/\d{3}/\d{3}/large/d41d8cd98f00b204e9800998ecf8427e.jpg$}, 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
@@ -72,10 +116,7 @@ class UserHelperTest < ActionView::TestCase
def test_auth_button
button = auth_button("google", "google")
- assert_equal button, ""
-
- button = auth_button("yahoo", "openid", :openid_url => "yahoo.com")
- assert_equal button, ""
+ assert_equal("", button)
end
private