Revert "Bump rails-i18n from 4.0.2 to 6.0.0"

[rails.git] / test / helpers / user_helper_test.rb

diff --git a/test/helpers/user_helper_test.rb b/test/helpers/user_helper_test.rb
index ea3464052f9ea9982d5182fe315ddfb342f6cf6b..397a90a63d0f5113c8bee401f6801e7099a6c727 100644 (file)
--- 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)
     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" .* src="/images/avatar_large.png" />$}, image

 
     image = user_image(user, :class => "foo")
 
     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_large.png" />$}, image

 
     image = user_image(gravatar_user)
     assert_match %r{^<img class="user_image" .* src="http://www.gravatar.com/avatar/.*" />$}, image
 
     image = user_image(gravatar_user)
     assert_match %r{^<img class="user_image" .* src="http://www.gravatar.com/avatar/.*" />$}, image


@@ -25,10 +25,10 @@ class UserHelperTest < ActionView::TestCase
     gravatar_user = create(:user, :image_use_gravatar => true)
 
     image = user_thumbnail(user)
     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" .* src="/images/avatar_small.png" />$}, image

 
     image = user_thumbnail(user, :class => "foo")
 
     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_small.png" />$}, image

 
     image = user_thumbnail(gravatar_user)
     assert_match %r{^<img class="user_thumbnail" .* src="http://www.gravatar.com/avatar/.*" />$}, image
 
     image = user_thumbnail(gravatar_user)
     assert_match %r{^<img class="user_thumbnail" .* src="http://www.gravatar.com/avatar/.*" />$}, image


@@ -42,10 +42,10 @@ class UserHelperTest < ActionView::TestCase
     gravatar_user = create(:user, :image_use_gravatar => true)
 
     image = user_thumbnail_tiny(user)
     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" .* src="/images/avatar_small.png" />$}, image

 
     image = user_thumbnail_tiny(user, :class => "foo")
 
     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_small.png" />$}, image

 
     image = user_thumbnail_tiny(gravatar_user)
     assert_match %r{^<img class="user_thumbnail_tiny" .* src="http://www.gravatar.com/avatar/.*" />$}, image
 
     image = user_thumbnail_tiny(gravatar_user)
     assert_match %r{^<img class="user_thumbnail_tiny" .* src="http://www.gravatar.com/avatar/.*" />$}, image


@@ -56,10 +56,11 @@ class UserHelperTest < ActionView::TestCase
 
   def test_user_image_url
     user = create(:user)
 
   def test_user_image_url
     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)
     gravatar_user = create(:user, :image_use_gravatar => true)
 
     url = user_image_url(user)

-    assert_match %r{^/users/images/original.png$}, 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
 
     url = user_image_url(gravatar_user)
     assert_match %r{^http://www.gravatar.com/avatar/}, url