From 5d7fa2cd455dc8dce1abc9baa9dd3132a3d85ca7 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sat, 12 Apr 2025 04:16:28 +0000 Subject: [PATCH] Merged r23641 from trunk to 5.1-stable (#42572). git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@23643 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/member_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/member_test.rb b/test/unit/member_test.rb index f92841b76..42fba4783 100644 --- a/test/unit/member_test.rb +++ b/test/unit/member_test.rb @@ -79,7 +79,7 @@ class MemberTest < ActiveSupport::TestCase [1, group_a_member.member_roles.find_by(role_id: 1).id], [1, group_b_member.member_roles.find_by(role_id: 1).id], [2, group_b_member.member_roles.find_by(role_id: 2).id], - ], test_user_member.member_roles.map{|r| [r.role_id, r.inherited_from]} + ].sort, test_user_member.member_roles.map{|r| [r.role_id, r.inherited_from]}.sort # Verify that a new non-inherited role is added and inherited roles are maintained test_user_member.set_editable_role_ids([3]) # Add Reporter role to test_user @@ -88,7 +88,7 @@ class MemberTest < ActiveSupport::TestCase [1, group_b_member.member_roles.find_by(role_id: 1).id], [2, group_b_member.member_roles.find_by(role_id: 2).id], [3, nil] - ], test_user_member.member_roles.map{|r| [r.role_id, r.inherited_from]} + ].sort, test_user_member.member_roles.map{|r| [r.role_id, r.inherited_from]}.sort end def test_validate