From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 9 Jan 2014 08:14:21 +0000 (+0000)
Subject: Rails4: replace deprecated find_all_by_* at UserTest
X-Git-Tag: 2.5.0~328
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=907663f83c3b4ce177c1d626cccc05690a821a6b;p=redmine.git

Rails4: replace deprecated find_all_by_* at UserTest

git-svn-id: http://svn.redmine.org/redmine/trunk@12571 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index b743e46c2..4e11ffecc 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -183,18 +183,18 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_destroy_should_delete_members_and_roles
-    members = Member.find_all_by_user_id(2)
-    ms = members.size
+    members = Member.where(:user_id => 2)
+    ms = members.count
     rs = members.collect(&:roles).flatten.size
-
+    assert ms > 0
+    assert rs > 0
     assert_difference 'Member.count', - ms do
       assert_difference 'MemberRole.count', - rs do
         User.find(2).destroy
       end
     end
-
     assert_nil User.find_by_id(2)
-    assert Member.find_all_by_user_id(2).empty?
+    assert_equal 0, Member.where(:user_id => 2).count
   end
 
   def test_destroy_should_update_attachments