X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3123822bba5865e81e8c10be16452a0a8b5362f9..72855280e75474735d0c2b65aae55a68eda71462:/test/models/user_test.rb

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 5de5db326..d480849dd 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 :languages, :user_roles
+  fixtures :user_roles
 
   def test_invalid_with_empty_attributes
     user = User.new
@@ -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
@@ -191,6 +191,10 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_languages
+    create(:language, :code => "en")
+    create(:language, :code => "de")
+    create(:language, :code => "sl")
+
     user = users(:normal_user)
     assert_equal ["en"], user.languages
     user.languages = %w(de fr en)