From df98a876331f33bbb6060f12e097f1919b1a4680 Mon Sep 17 00:00:00 2001 From: Katsuya Hidaka Date: Thu, 15 May 2025 08:18:48 +0900 Subject: Use visible? for method names for consistency --- app/helpers/reactions_helper.rb | 2 +- lib/redmine/reaction.rb | 4 ++-- test/unit/lib/redmine/reaction_test.rb | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/helpers/reactions_helper.rb b/app/helpers/reactions_helper.rb index 623a7a0e8..5c0b807ee 100644 --- a/app/helpers/reactions_helper.rb +++ b/app/helpers/reactions_helper.rb @@ -22,7 +22,7 @@ module ReactionsHelper DISPLAY_REACTION_USERS_LIMIT = 10 def reaction_button(object) - return unless Redmine::Reaction.viewable?(object, User.current) + return unless Redmine::Reaction.visible?(object, User.current) detail = object.reaction_detail diff --git a/lib/redmine/reaction.rb b/lib/redmine/reaction.rb index 17797a7d7..09fb78ef8 100644 --- a/lib/redmine/reaction.rb +++ b/lib/redmine/reaction.rb @@ -23,13 +23,13 @@ module Redmine REACTABLE_TYPES = %w(Journal Issue Message News Comment) # Returns true if the user can view the reaction of the object - def self.viewable?(object, user = User.current) + def self.visible?(object, user = User.current) Setting.reactions_enabled? && object.visible?(user) end # Returns true if the user can add/remove a reaction to/from the object def self.editable?(object, user = User.current) - user.logged? && viewable?(object, user) && object&.project&.active? + user.logged? && visible?(object, user) && object&.project&.active? end module Reactable diff --git a/test/unit/lib/redmine/reaction_test.rb b/test/unit/lib/redmine/reaction_test.rb index 45475a163..f3228a3bd 100644 --- a/test/unit/lib/redmine/reaction_test.rb +++ b/test/unit/lib/redmine/reaction_test.rb @@ -124,29 +124,29 @@ class Redmine::ReactionTest < ActiveSupport::TestCase ), comment1.reaction_detail end - test 'viewable? returns true when reactions are enabled and object is visible to user' do + test 'visible? returns true when reactions are enabled and object is visible to user' do object = issues(:issues_007) user = users(:users_002) - assert Redmine::Reaction.viewable?(object, user) + assert Redmine::Reaction.visible?(object, user) end - test 'viewable? returns false when reactions are disabled' do + test 'visible? returns false when reactions are disabled' do Setting.reactions_enabled = '0' object = issues(:issues_007) user = users(:users_002) - assert_not Redmine::Reaction.viewable?(object, user) + assert_not Redmine::Reaction.visible?(object, user) end - test 'viewable? returns false when object is not visible to user' do + test 'visible? returns false when object is not visible to user' do object = issues(:issues_007) user = users(:users_002) object.expects(:visible?).with(user).returns(false) - assert_not Redmine::Reaction.viewable?(object, user) + assert_not Redmine::Reaction.visible?(object, user) end test 'editable? returns true for various reactable objects when user is logged in, object is visible, and project is active' do -- 2.49.0