]> source.dussan.org Git - redmine.git/commitdiff
Rails4: replace deprecated find_all_by_* at UserTest
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 9 Jan 2014 08:14:21 +0000 (08:14 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 9 Jan 2014 08:14:21 +0000 (08:14 +0000)
git-svn-id: http://svn.redmine.org/redmine/trunk@12571 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/unit/user_test.rb

index b743e46c2418247477dd658c56293639ff0d09cb..4e11ffecc94b4b20ed80c84f4801d705794b24e0 100644 (file)
@@ -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