X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f04211b1722e27037b305b58479157b5a492f30a..bfe760a4b0372188f4964914bbc8e5bed31363ba:/test/models/user_test.rb?ds=sidebyside

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index adae97a0e..5de5db326 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -5,7 +5,7 @@ class UserTest < ActiveSupport::TestCase
   include Rails::Dom::Testing::Assertions::SelectorAssertions
 
   api_fixtures
-  fixtures :friends, :languages, :user_roles
+  fixtures :languages, :user_roles
 
   def test_invalid_with_empty_attributes
     user = User.new
@@ -106,6 +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)
     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))
@@ -116,9 +117,9 @@ class UserTest < ActiveSupport::TestCase
 
   def test_users_nearby
     # second user has their data public and is close by normal user
-    assert_equal [users(:public_user)], users(:normal_user).nearby
+    assert_equal [users(:public_user), users(:german_user)], users(:normal_user).nearby
     # second_user has normal user nearby, but normal user has their data private
-    assert_equal [], users(:public_user).nearby
+    assert_equal [users(:german_user)], users(:public_user).nearby
     # inactive_user has no user nearby
     assert_equal [], users(:inactive_user).nearby
     # north_pole_user has no user nearby, and doesn't throw exception
@@ -129,16 +130,13 @@ class UserTest < ActiveSupport::TestCase
 
   def test_friends_with
     # normal user is a friend of second user
-    # it should be a one way friend accossitation
-    assert_equal 1, Friend.count
+    # it should be a one way friend associatation
     norm = users(:normal_user)
     sec = users(:public_user)
-    # friend = Friend.new
-    # friend.befriender = norm
-    # friend.befriendee = sec
-    # friend.save
-    assert_equal [sec], norm.nearby
-    assert_equal 1, norm.nearby.size
+    create(:friend, :user_id => norm.id, :friend_user_id => sec.id)
+    assert_equal 1, Friend.count
+    assert_equal [sec], norm.friend_users
+    assert_equal 1, norm.friend_users.size
     assert_equal 1, Friend.count
     assert norm.is_friends_with?(sec)
     assert !sec.is_friends_with?(norm)
@@ -163,7 +161,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_visible
-    assert_equal 15, User.visible.count
+    assert_equal 22, User.visible.count
     assert_raise ActiveRecord::RecordNotFound do
       User.visible.find(users(:suspended_user).id)
     end
@@ -173,7 +171,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_active
-    assert_equal 14, User.active.count
+    assert_equal 21, User.active.count
     assert_raise ActiveRecord::RecordNotFound do
       User.active.find(users(:inactive_user).id)
     end
@@ -186,7 +184,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_identifiable
-    assert_equal 16, User.identifiable.count
+    assert_equal 23, User.identifiable.count
     assert_raise ActiveRecord::RecordNotFound do
       User.identifiable.find(users(:normal_user).id)
     end
@@ -199,7 +197,9 @@ class UserTest < ActiveSupport::TestCase
     assert_equal %w(de fr en), user.languages
     user.languages = %w(fr de sl)
     assert_equal "de", user.preferred_language
-    assert_equal "de", user.preferred_language_from(%w(en sl de es))
+    assert_equal %w(fr de sl), user.preferred_languages.map(&:to_s)
+    user = users(:public_user)
+    assert_equal %w(en de), user.languages
   end
 
   def test_visible?