X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c8ee1351049ef1bb4d7b50d071b2a96154266d1d..2c13981b0fa6d7b6ddfc4277c53eb9c515dd2736:/test/unit/user_test.rb?ds=inline diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index c0df4b716..184c2436a 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -1,8 +1,9 @@ require File.dirname(__FILE__) + '/../test_helper' -class UserTest < Test::Unit::TestCase - fixtures :users - +class UserTest < ActiveSupport::TestCase + api_fixtures + fixtures :friends + def test_invalid_with_empty_attributes user = User.new assert !user.valid? @@ -23,7 +24,7 @@ class UserTest < Test::Unit::TestCase :data_public => 1, :description => "desc") assert !new_user.save - assert_equal ActiveRecord::Errors.default_error_messages[:taken], new_user.errors.on(:email) + assert_equal "has already been taken", new_user.errors.on(:email) end def test_unique_display_name @@ -34,7 +35,7 @@ class UserTest < Test::Unit::TestCase :data_public => 1, :description => "desc") assert !new_user.save - assert_equal ActiveRecord::Errors.default_error_messages[:taken], new_user.errors.on(:display_name) + assert_equal "has already been taken", new_user.errors.on(:display_name) end def test_email_valid @@ -96,19 +97,19 @@ class UserTest < Test::Unit::TestCase end def test_friend_with - assert_equal true, users(:normal_user).is_friends_with?(users(:second_user)) + assert_equal true, users(:normal_user).is_friends_with?(users(:public_user)) assert_equal false, users(:normal_user).is_friends_with?(users(:inactive_user)) - assert_equal false, users(:second_user).is_friends_with?(users(:normal_user)) - assert_equal false, users(:second_user).is_friends_with?(users(:inactive_user)) + assert_equal false, users(:public_user).is_friends_with?(users(:normal_user)) + assert_equal false, users(:public_user).is_friends_with?(users(:inactive_user)) assert_equal false, users(:inactive_user).is_friends_with?(users(:normal_user)) - assert_equal false, users(:inactive_user).is_friends_with?(users(:second_user)) + assert_equal false, users(:inactive_user).is_friends_with?(users(:public_user)) end def test_users_nearby # second user has their data public and is close by normal user - assert_equal [users(:second_user)], users(:normal_user).nearby + assert_equal [users(:public_user)], users(:normal_user).nearby # second_user has normal user nearby, but normal user has their data private - assert_equal [], users(:second_user).nearby + assert_equal [], users(:public_user).nearby # inactive_user has no user nearby assert_equal [], users(:inactive_user).nearby end @@ -118,7 +119,7 @@ class UserTest < Test::Unit::TestCase # it should be a one way friend accossitation assert_equal 1, Friend.count norm = users(:normal_user) - sec = users(:second_user) + sec = users(:public_user) #friend = Friend.new #friend.befriender = norm #friend.befriendee = sec @@ -129,10 +130,10 @@ class UserTest < Test::Unit::TestCase assert_equal true, norm.is_friends_with?(sec) assert_equal false, sec.is_friends_with?(norm) assert_equal false, users(:normal_user).is_friends_with?(users(:inactive_user)) - assert_equal false, users(:second_user).is_friends_with?(users(:normal_user)) - assert_equal false, users(:second_user).is_friends_with?(users(:inactive_user)) + assert_equal false, users(:public_user).is_friends_with?(users(:normal_user)) + assert_equal false, users(:public_user).is_friends_with?(users(:inactive_user)) assert_equal false, users(:inactive_user).is_friends_with?(users(:normal_user)) - assert_equal false, users(:inactive_user).is_friends_with?(users(:second_user)) + assert_equal false, users(:inactive_user).is_friends_with?(users(:public_user)) #Friend.delete(friend) #assert_equal 0, Friend.count end