summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2024-11-30 06:54:49 +0000
committerGo MAEDA <maeda@farend.jp>2024-11-30 06:54:49 +0000
commitfc04d9e1d0093507786efed21169630c5f77bf47 (patch)
treeaa43734aa47401f42f9b0ca37da49bf9e702e618
parent30a96325e9a3a6fc357f022bac57b57bb0e25279 (diff)
downloadredmine-fc04d9e1d0093507786efed21169630c5f77bf47.tar.gz
redmine-fc04d9e1d0093507786efed21169630c5f77bf47.zip
Merged r23322 from trunk to 5.1-stable (#41889).
git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@23332 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--test/unit/lib/redmine/acts/mentionable_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/unit/lib/redmine/acts/mentionable_test.rb b/test/unit/lib/redmine/acts/mentionable_test.rb
index 8cc86057f..97fb553fb 100644
--- a/test/unit/lib/redmine/acts/mentionable_test.rb
+++ b/test/unit/lib/redmine/acts/mentionable_test.rb
@@ -49,13 +49,13 @@ class Redmine::Acts::MentionableTest < ActiveSupport::TestCase
def test_mentioned_users_with_multiple_mentions
issue = Issue.generate!(project_id: 1, description: 'Hello @dlopper, @jsmith.')
- assert_equal [User.find(2), User.find(3)], issue.mentioned_users
+ assert_equal [User.find(2), User.find(3)], issue.mentioned_users.sort_by(&:id)
end
def test_mentioned_users_should_not_mention_same_user_multiple_times
issue = Issue.generate!(project_id: 1, description: '@dlopper @jsmith @dlopper')
- assert_equal [User.find(2), User.find(3)], issue.mentioned_users
+ assert_equal [User.find(2), User.find(3)], issue.mentioned_users.sort_by(&:id)
end
def test_mentioned_users_should_include_only_active_users
@@ -137,7 +137,7 @@ class Redmine::Acts::MentionableTest < ActiveSupport::TestCase
def test_notified_mentions
issue = Issue.generate!(project_id: 1, description: 'Hello @dlopper, @jsmith.')
- assert_equal [User.find(2), User.find(3)], issue.notified_mentions
+ assert_equal [User.find(2), User.find(3)], issue.notified_mentions.sort_by(&:id)
end
def test_notified_mentions_should_not_include_users_who_out_of_all_email