gravatar_user = create(:user, :image_use_gravatar => true)
image = user_image(user)
- assert_match %r{^<img class="user_image" .* src="/assets/users/images/large-.*" />$}, image
+ assert_match %r{^<img class="user_image border border-secondary-subtle bg-body" .* src="/images/avatar.svg" />$}, image
image = user_image(user, :class => "foo")
- assert_match %r{^<img class="foo" .* src="/assets/users/images/large-.*" />$}, image
-
+ assert_match %r{^<img class="foo" .* src="/images/avatar.svg" />$}, image
image = user_image(gravatar_user)
- assert_match %r{^<img class="user_image" .* src="http://www.gravatar.com/avatar/.*" />$}, image
+ assert_match %r{^<img class="user_image border border-secondary-subtle bg-body" .* src="http://www.gravatar.com/avatar/.*" />$}, image
image = user_image(gravatar_user, :class => "foo")
assert_match %r{^<img class="foo" .* src="http://www.gravatar.com/avatar/.*" />$}, image
gravatar_user = create(:user, :image_use_gravatar => true)
image = user_thumbnail(user)
- assert_match %r{^<img class="user_thumbnail" .* src="/assets/users/images/small-.*" />$}, image
+ assert_match %r{^<img class="user_thumbnail border border-secondary-subtle bg-body" .* src="/images/avatar.svg" />$}, image
image = user_thumbnail(user, :class => "foo")
- assert_match %r{^<img class="foo" .* src="/assets/users/images/small-.*" />$}, image
+ assert_match %r{^<img class="foo" .* src="/images/avatar.svg" />$}, image
image = user_thumbnail(gravatar_user)
- assert_match %r{^<img class="user_thumbnail" .* src="http://www.gravatar.com/avatar/.*" />$}, image
+ assert_match %r{^<img class="user_thumbnail border border-secondary-subtle bg-body" .* src="http://www.gravatar.com/avatar/.*" />$}, image
image = user_thumbnail(gravatar_user, :class => "foo")
assert_match %r{^<img class="foo" .* src="http://www.gravatar.com/avatar/.*" />$}, image
gravatar_user = create(:user, :image_use_gravatar => true)
image = user_thumbnail_tiny(user)
- assert_match %r{^<img class="user_thumbnail_tiny" .* src="/assets/users/images/small-.*" />$}, image
+ assert_match %r{^<img class="user_thumbnail_tiny border border-secondary-subtle bg-body" .* src="/images/avatar.svg" />$}, image
image = user_thumbnail_tiny(user, :class => "foo")
- assert_match %r{^<img class="foo" .* src="/assets/users/images/small-.*" />$}, image
+ assert_match %r{^<img class="foo" .* src="/images/avatar.svg" />$}, image
image = user_thumbnail_tiny(gravatar_user)
- assert_match %r{^<img class="user_thumbnail_tiny" .* src="http://www.gravatar.com/avatar/.*" />$}, image
+ assert_match %r{^<img class="user_thumbnail_tiny border border-secondary-subtle bg-body" .* src="http://www.gravatar.com/avatar/.*" />$}, image
image = user_thumbnail_tiny(gravatar_user, :class => "foo")
assert_match %r{^<img class="foo" .* src="http://www.gravatar.com/avatar/.*" />$}, 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}/original/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{^<img .* width="100" height="100" .* />$}, image
+
+ thumbnail = user_thumbnail(user)
+ assert_match %r{^<img .* width="50" height="50" .* />$}, 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{^<img .* width="100" height="100" .* />$}, image
+
+ thumbnail = user_thumbnail(user)
+ assert_no_match %r{^<img .* width="50" height="50" .* />$}, 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{^<img .* width="100" height="100" .* />$}, image
+
+ thumbnail = user_thumbnail(user)
+ assert_match %r{^<img .* width="50" height="50" .* />$}, thumbnail
+ end
+
+ def test_user_image_sizes_gravatar
+ user = create(:user, :image_use_gravatar => true)
+
+ image = user_image(user)
+ assert_match %r{^<img .* width="100" height="100" .* />$}, image
+
+ thumbnail = user_thumbnail(user)
+ assert_match %r{^<img .* width="50" height="50" .* />$}, thumbnail
+ end
+
def test_openid_logo
logo = openid_logo
- assert_match %r{^<img .* class="openid_logo" src="/images/openid_small.png" />$}, logo
+ assert_match %r{^<img .* src="/images/openid_small.png" />$}, logo
end
def test_auth_button
button = auth_button("google", "google")
- assert_equal button, "<a class=\"auth_button\" title=\"Login with Google\" href=\"/auth/google\"><img alt=\"Login with a Google OpenID\" src=\"/images/google.png\" /></a>"
-
- button = auth_button("yahoo", "openid", :openid_url => "yahoo.com")
- assert_equal button, "<a class=\"auth_button\" title=\"Login with Yahoo\" href=\"/auth/openid?openid_url=yahoo\.com\"><img alt=\"Login with a Yahoo OpenID\" src=\"/images/yahoo.png\" /></a>"
+ img_tag = "<img alt=\"Log in with a Google OpenID\" class=\"rounded-1\" src=\"/images/google.svg\" width=\"24\" height=\"24\" />"
+ assert_equal("<a class=\"auth_button p-2 d-block\" title=\"Log in with Google\" rel=\"nofollow\" data-method=\"post\" href=\"/auth/google\">#{img_tag}</a>", button)
end
private
projects / rails.git / blobdiff