2 files changed, 18 insertions, 6 deletions
diff --git a/test/helpers/avatars_helper_test.rb b/test/helpers/avatars_helper_test.rb
index f407ae09e..baa64a653 100644
--- a/test/helpers/avatars_helper_test.rb
+++ b/test/helpers/avatars_helper_test.rb
@@ -68,6 +68,18 @@ class AvatarsHelperTest < Redmine::HelperTest
     assert_include 'class="gravatar picture"', avatar('jsmith <jsmith@somenet.foo>', :class => 'picture')
   end
 
+  def test_avatar_with_initials
+    with_settings :gravatar_default => 'initials' do
+      assert_include 'initials="RA"', avatar(User.find(1))
+    end
+  end
+
+  def test_avatar_should_reject_initials_if_default_is_not_initials
+    with_settings :gravatar_default => 'identicon' do
+      assert_not_include 'initials="RA"', avatar(User.find(1))
+    end
+  end
+
   def test_avatar_disabled
     with_settings :gravatar_enabled => '0' do
       assert_equal '', avatar(User.find_by_mail('jsmith@somenet.foo'))
diff --git a/test/helpers/reactions_helper_test.rb b/test/helpers/reactions_helper_test.rb
index f3a4e38d8..ab722e3ca 100644
--- a/test/helpers/reactions_helper_test.rb
+++ b/test/helpers/reactions_helper_test.rb
@@ -106,12 +106,10 @@ class ReactionsHelperTest < ActionView::TestCase
     assert_select_in result, 'a.reaction-button[title=?]', expected_tooltip
   end
 
-  test 'reaction_button displays non-visible users as "X other" in the tooltip' do
+  test 'reaction_button should not count and display non-visible users' do
     issue2 = issues(:issues_002)
 
     issue2.reaction_detail = Reaction::Detail.new(
-      # The remaining 3 users are non-visible users
-      reaction_count: 5,
       visible_users: users(:users_002, :users_003)
     )
 
@@ -119,11 +117,10 @@ class ReactionsHelperTest < ActionView::TestCase
       reaction_button(issue2)
     end
 
-    assert_select_in result, 'a.reaction-button[title=?]', 'John Smith, Dave Lopper, and 3 others'
+    assert_select_in result, 'a.reaction-button[title=?]', 'John Smith and Dave Lopper'
 
     # When all users are non-visible users
     issue2.reaction_detail = Reaction::Detail.new(
-      reaction_count: 2,
       visible_users: []
     )
 
@@ -131,7 +128,10 @@ class ReactionsHelperTest < ActionView::TestCase
       reaction_button(issue2)
     end
 
-    assert_select_in result, 'a.reaction-button[title=?]', '2 others'
+    assert_select_in result, 'a.reaction-button[title]', false
+    assert_select_in result, 'a.reaction-button' do
+      assert_select 'span.icon-label', '0'
+    end
   end
 
   test 'reaction_button formats the tooltip content based on the support.array settings of each locale' do