Allow space as a language separator

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

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index adae97a0e759ab664dc726e1fd5ea5ffc3ae7c2b..b5a9f45ff3d01a6b786118d1026be2300cc99d8c 100644 (file)
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -116,9 +116,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
@@ -137,8 +137,8 @@ class UserTest < ActiveSupport::TestCase
     # friend.befriender = norm
     # friend.befriendee = sec
     # friend.save
-    assert_equal [sec], norm.nearby
-    assert_equal 1, norm.nearby.size
+    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 +163,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_visible
-    assert_equal 15, User.visible.count
+    assert_equal 16, User.visible.count
     assert_raise ActiveRecord::RecordNotFound do
       User.visible.find(users(:suspended_user).id)
     end
@@ -173,7 +173,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_active
-    assert_equal 14, User.active.count
+    assert_equal 15, User.active.count
     assert_raise ActiveRecord::RecordNotFound do
       User.active.find(users(:inactive_user).id)
     end
@@ -186,7 +186,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_identifiable
-    assert_equal 16, User.identifiable.count
+    assert_equal 17, User.identifiable.count
     assert_raise ActiveRecord::RecordNotFound do
       User.identifiable.find(users(:normal_user).id)
     end
@@ -200,6 +200,8 @@ class UserTest < ActiveSupport::TestCase
     user.languages = %w(fr de sl)
     assert_equal "de", user.preferred_language
     assert_equal "de", user.preferred_language_from(%w(en sl de es))
+    user = users(:public_user)
+    assert_equal %w(en de), user.languages
   end
 
   def test_visible?