Merge pull request #97 from finnlabs/pulls/577/invalid-watcher-user-fix

Invalid watcher user error when adding an invalid user as watcher #577

Merge pull request #97 from finnlabs/pulls/577/invalid-watcher-user-fix
Invalid watcher user error when adding an invalid user as watcher #577
9e12deda · Felix Schäfer · a7ab39dd · 5d7bc5c9 · 9e12deda · 9e12deda
Commit 9e12deda authored Aug 21, 2011 by Felix Schäfer
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 1 deletion

watcher_test.rb test/unit/watcher_test.rb +21 -0

acts_as_watchable.rb vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb +1 -1

No files found.
--- a/test/unit/watcher_test.rb
+++ b/test/unit/watcher_test.rb
@@ -42,7 +42,28 @@ class WatcherTest < ActiveSupport::TestCase
    assert Issue.watched_by(@user).include?(@issue)
  end

+  def test_watcher_users
+    watcher_users = Issue.find(2).watcher_users
+    assert_kind_of Array, watcher_users
+    assert_kind_of User, watcher_users.first
+  end
+
+  def test_watcher_users_should_not_validate_user
+    User.update_all("firstname = ''", "id=1")
+    @user.reload
+    assert !@user.valid?
+
+    issue = Issue.new(:project => Project.find(1), :tracker_id => 1, :subject => "test", :author => User.find(2))
+    issue.watcher_users << @user
+    issue.save!
+    assert issue.watched_by?(@user)
+  end
+
  def test_watcher_user_ids
+    assert_equal [1, 3], Issue.find(2).watcher_user_ids.sort
+  end
+
+  def test_watcher_user_ids=
    issue = Issue.new
    issue.watcher_user_ids = ['1', '3']
    assert issue.watched_by?(User.find(1))

--- a/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb
+++ b/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb
@@ -13,7 +13,7 @@ module Redmine
          
          class_eval do
            has_many :watchers, :as => :watchable, :dependent => :delete_all
-            has_many :watcher_users, :through => :watchers, :source => :user
+            has_many :watcher_users, :through => :watchers, :source => :user, :validate => false
            
            named_scope :watched_by, lambda { |user_id|
              { :include => :watchers,