X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a39c645602f9d27b7927500c93890f4d7d79620e..2169c503efbbeb45c3842e9fa5eef6cc01e8e27b:/test/models/user_test.rb?ds=sidebyside diff --git a/test/models/user_test.rb b/test/models/user_test.rb index a17c30deb..96c6632ff 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -105,7 +105,7 @@ class UserTest < ActiveSupport::TestCase alice = create(:user, :active) bob = create(:user, :active) charlie = create(:user, :active) - create(:friend, :befriender => alice, :befriendee => bob) + create(:friendship, :befriender => alice, :befriendee => bob) assert alice.is_friends_with?(bob) assert_not alice.is_friends_with?(charlie) @@ -136,16 +136,16 @@ class UserTest < ActiveSupport::TestCase assert_equal [], vagrant_user.nearby end - def test_friend_users + def test_friends norm = create(:user, :active) sec = create(:user, :active) - create(:friend, :befriender => norm, :befriendee => sec) + create(:friendship, :befriender => norm, :befriendee => sec) - assert_equal [sec], norm.friend_users - assert_equal 1, norm.friend_users.size + assert_equal [sec], norm.friends + assert_equal 1, norm.friends.size - assert_equal [], sec.friend_users - assert_equal 0, sec.friend_users.size + assert_equal [], sec.friends + assert_equal 0, sec.friends.size end def test_user_preferred_editor