Merged r16116 (#22034).

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16128 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2017-01-04 18:09:00 +00:00
parent a9b0564c13
commit 7ec2c27385
5 changed files with 52 additions and 16 deletions

View File

@@ -119,6 +119,16 @@ class MembersControllerTest < ActionController::TestCase
assert_redirected_to '/projects/ecookbook/settings/members'
end
def test_update_locked_member_should_be_allowed
User.find(3).lock!
put :update, :id => 2, :membership => {:role_ids => [1]}
assert_response 302
member = Member.find(2)
assert member.user.locked?
assert_equal [1], member.role_ids
end
def test_update_should_not_add_unmanaged_roles
role = Role.find(1)
role.update! :all_roles_managed => false
@@ -160,6 +170,14 @@ class MembersControllerTest < ActionController::TestCase
assert !User.find(3).member_of?(Project.find(1))
end
def test_destroy_locked_member_should_be_allowed
assert User.find(3).lock!
assert_difference 'Member.count', -1 do
delete :destroy, :id => 2
end
end
def test_destroy_should_fail_with_unmanaged_roles
role = Role.find(1)
role.update! :all_roles_managed => false