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

4 files changed, 121 insertions, 4 deletions

diff --git a/test/fixtures/enabled_modules.yml b/test/fixtures/enabled_modules.yml
index b0fbf63ea..0a83168df 100644
--- a/test/fixtures/enabled_modules.yml
+++ b/test/fixtures/enabled_modules.yml
@@ -59,3 +59,7 @@ enabled_modules_015:
   name: wiki
   project_id: 2
   id: 15
+enabled_modules_016: 
+  name: boards
+  project_id: 2
+  id: 16
diff --git a/test/fixtures/messages.yml b/test/fixtures/messages.yml
index b1c59772b..b193599d5 100644
--- a/test/fixtures/messages.yml
+++ b/test/fixtures/messages.yml
@@ -66,3 +66,14 @@ messages_006:
   author_id: 3
   parent_id: 4
   board_id: 1
+messages_007: 
+  created_on: <%= 2.days.ago.to_date.to_s(:db) %>
+  updated_on: <%= 2.days.ago.to_date.to_s(:db) %>
+  subject: 'Message on a private project'
+  id: 7
+  replies_count: 0
+  last_reply_id: 
+  content: "This is a private message"
+  author_id: 1
+  parent_id: 
+  board_id: 3
diff --git a/test/unit/member_test.rb b/test/unit/member_test.rb
index 41ac48859..323ec1e9e 100644
--- a/test/unit/member_test.rb
+++ b/test/unit/member_test.rb
@@ -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
diff --git a/test/unit/watcher_test.rb b/test/unit/watcher_test.rb
index f49365edf..db73f8ccc 100644
--- a/test/unit/watcher_test.rb
+++ b/test/unit/watcher_test.rb
@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2009  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -18,7 +18,11 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class WatcherTest < ActiveSupport::TestCase
-  fixtures :issues, :users
+  fixtures :projects, :users, :members, :member_roles, :roles, :enabled_modules,
+           :issues,
+           :boards, :messages,
+           :wikis, :wiki_pages,
+           :watchers
 
   def setup
     @user = User.find(1)
@@ -66,4 +70,36 @@ class WatcherTest < ActiveSupport::TestCase
     @issue.reload
     assert_equal 1, @issue.remove_watcher(@user)  
   end
+  
+  def test_prune
+    Watcher.delete_all("user_id = 9")
+    user = User.find(9)
+    
+    # public
+    Watcher.create!(:watchable => Issue.find(1), :user => user)
+    Watcher.create!(:watchable => Issue.find(2), :user => user)
+    Watcher.create!(:watchable => Message.find(1), :user => user)
+    Watcher.create!(:watchable => Wiki.find(1), :user => user)
+    Watcher.create!(:watchable => WikiPage.find(2), :user => user)
+    
+    # private project (id: 2)
+    Member.create!(:project => Project.find(2), :principal => user, :role_ids => [1])
+    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)
+    
+    assert_no_difference 'Watcher.count' do
+      Watcher.prune(:user => User.find(9))
+    end
+    
+    Member.delete_all
+    
+    assert_difference 'Watcher.count', -4 do
+      Watcher.prune(:user => User.find(9))
+    end
+    
+    assert Issue.find(1).watched_by?(user)
+    assert !Issue.find(4).watched_by?(user)
+  end
 end