Makes user unwatch what he can no longer view after its permissions have changed (#3589).
A rake task (redmine:watchers:prune) is also added to prune existing watchers. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3167 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
c31a671973
commit
f33231181f
12 files changed
+203
-6
No files matched your search
@@ -18,7 +18,7 @@
|
||||
require File.dirname(__FILE__) + '/../test_helper'
|
||||
|
||||
class MemberTest < ActiveSupport::TestCase
|
||||
fixtures :users, :projects, :roles, :members, :member_roles
|
||||
fixtures :all
|
||||
|
||||
def setup
|
||||
@jsmith = Member.find(1)
|
||||
@@ -68,4 +68,70 @@ class MemberTest < ActiveSupport::TestCase
|
||||
|
||||
assert_raise(ActiveRecord::RecordNotFound) { Member.find(@jsmith.id) }
|
||||
end
|
||||
|
||||
context "removing permissions" do
|
||||
setup do
|
||||
Watcher.delete_all("user_id = 9")
|
||||
user = User.find(9)
|
||||
# public
|
||||
Watcher.create!(:watchable => Issue.find(1), :user_id => user)
|
||||
# private
|
||||
Watcher.create!(:watchable => Issue.find(4), :user => user)
|
||||
Watcher.create!(:watchable => Message.find(7), :user => user)
|
||||
Watcher.create!(:watchable => Wiki.find(2), :user => user)
|
||||
Watcher.create!(:watchable => WikiPage.find(3), :user => user)
|
||||
end
|
||||
|
||||
context "of user" do
|
||||
setup do
|
||||
@member = Member.create!(:project => Project.find(2), :principal => User.find(9), :role_ids => [1, 2])
|
||||
end
|
||||
|
||||
context "by deleting membership" do
|
||||
should "prune watchers" do
|
||||
assert_difference 'Watcher.count', -4 do
|
||||
@member.destroy
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context "by updating roles" do
|
||||
should "prune watchers" do
|
||||
Role.find(2).remove_permission! :view_wiki_pages
|
||||
member = Member.first(:order => 'id desc')
|
||||
assert_difference 'Watcher.count', -2 do
|
||||
member.role_ids = [2]
|
||||
member.save
|
||||
end
|
||||
assert !Message.find(7).watched_by?(@user)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context "of group" do
|
||||
setup do
|
||||
group = Group.find(10)
|
||||
@member = Member.create!(:project => Project.find(2), :principal => group, :role_ids => [1, 2])
|
||||
group.users << User.find(9)
|
||||
end
|
||||
|
||||
context "by deleting membership" do
|
||||
should "prune watchers" do
|
||||
assert_difference 'Watcher.count', -4 do
|
||||
@member.destroy
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context "by updating roles" do
|
||||
should "prune watchers" do
|
||||
Role.find(2).remove_permission! :view_wiki_pages
|
||||
assert_difference 'Watcher.count', -2 do
|
||||
@member.role_ids = [2]
|
||||
@member.save
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
Reference in new issue
Block a user