X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f9291ba5764fe104264ae7e3b6a361e11212e8b..4fac47a214d4f0ab2228cdb3b0f646f11d41b4ef:/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 c57299a96..340d2494d 100644 --- a/test/helpers/user_helper_test.rb +++ b/test/helpers/user_helper_test.rb @@ -8,10 +8,10 @@ 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 + assert_match %r{^$}, image image = user_image(gravatar_user) assert_match %r{^$}, image @@ -25,10 +25,10 @@ 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 + assert_match %r{^$}, image image = user_thumbnail(gravatar_user) assert_match %r{^$}, image @@ -42,10 +42,10 @@ 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 + assert_match %r{^$}, image image = user_thumbnail_tiny(gravatar_user) assert_match %r{^$}, image @@ -55,11 +55,12 @@ class UserHelperTest < ActionView::TestCase 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/[^/]+/[^/]+/a.gif$}, url url = user_image_url(gravatar_user) assert_match %r{^http://www.gravatar.com/avatar/}, url @@ -72,10 +73,10 @@ class UserHelperTest < ActionView::TestCase def test_auth_button button = auth_button("google", "google") - assert_equal button, "\"Login" + assert_equal("\"Login", button) button = auth_button("yahoo", "openid", :openid_url => "yahoo.com") - assert_equal button, "\"Login" + assert_equal("\"Login", button) end private