Merge remote-tracking branch 'openstreetmap/pull/1331'

[rails.git] / test / models / user_test.rb

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 5de5db326a34033a4ddda42184456c0fb013b298..275e95d6cba850fe3b8f0ab8165ee66d8b575266 100644 (file)
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -106,7 +106,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_friend_with
-    create(:friend, :user_id => users(:normal_user).id, :friend_user_id => users(:public_user).id)
+    create(:friend, :befriender => users(:normal_user), :befriendee => users(:public_user))
     assert users(:normal_user).is_friends_with?(users(:public_user))
     assert !users(:normal_user).is_friends_with?(users(:inactive_user))
     assert !users(:public_user).is_friends_with?(users(:normal_user))
@@ -133,7 +133,7 @@ class UserTest < ActiveSupport::TestCase
     # it should be a one way friend associatation
     norm = users(:normal_user)
     sec = users(:public_user)
-    create(:friend, :user_id => norm.id, :friend_user_id => sec.id)
+    create(:friend, :befriender => norm, :befriendee => sec)
     assert_equal 1, Friend.count
     assert_equal [sec], norm.friend_users
     assert_equal 1, norm.friend_users.size