From: Andy Allan <git@gravitystorm.co.uk>
Date: Thu, 2 Feb 2017 13:20:51 +0000 (+0000)
Subject: Convert test_friend_with to use factories, and use alice/bob/charlie for easier under... 
X-Git-Tag: live~3657^2~3
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f96c563c10e7d2fd3e90e9bcf1c58b0dc804a3d9

Convert test_friend_with to use factories, and use alice/bob/charlie for easier understanding.
---

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 3f66c5827..dd2f9691d 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -108,13 +108,17 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_friend_with
-    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))
-    assert !users(:public_user).is_friends_with?(users(:inactive_user))
-    assert !users(:inactive_user).is_friends_with?(users(:normal_user))
-    assert !users(:inactive_user).is_friends_with?(users(:public_user))
+    alice = create(:user, :active)
+    bob = create(:user, :active)
+    charlie = create(:user, :active)
+    create(:friend, :befriender => alice, :befriendee => bob)
+
+    assert alice.is_friends_with?(bob)
+    assert !alice.is_friends_with?(charlie)
+    assert !bob.is_friends_with?(alice)
+    assert !bob.is_friends_with?(charlie)
+    assert !charlie.is_friends_with?(bob)
+    assert !charlie.is_friends_with?(alice)
   end
 
   def test_users_nearby