X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/38a610fd316c4d5143c2af2e71f73da6f249ac45..2d5df687fcbf2564e2f199535aed04f67953bd0e:/test/unit/user_test.rb?ds=sidebyside
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 9f04bd1d6..1346c855c 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -52,7 +52,7 @@ class UserTest < ActiveSupport::TestCase
ok.each do |name|
user = users(:normal_user)
user.email = name
- assert user.valid?(:save), user.errors.full_messages
+ assert user.valid?(:save), user.errors.full_messages.join(",")
end
bad.each do |name|
@@ -81,12 +81,12 @@ class UserTest < ActiveSupport::TestCase
# Due to sanitisation in the view some of these that you might not
# expact are allowed
# However, would they affect the xml planet dumps?
- ok = [ "Name", "'me", "he\"", "#ping", "
", "*ho", "\"help\"@",
+ ok = [ "Name", "'me", "he\"", "
", "*ho", "\"help\"@",
"vergröÃern", "ã«ã·ã¹ãã ã«ã対å¿ãã¾ã", "è¼è§¸ææçéæ²" ]
# These need to be 3 chars in length, otherwise the length test above
# should be used.
bad = [ "
", "test@example.com", "s/f", "aa/", "aa;", "aa.",
- "aa,", "aa?", "/;.,?", "ã対å¿ãã¾ã/" ]
+ "aa,", "aa?", "/;.,?", "ã対å¿ãã¾ã/", "#ping" ]
ok.each do |display_name|
user = users(:normal_user)
user.display_name = display_name
@@ -102,12 +102,12 @@ class UserTest < ActiveSupport::TestCase
end
def test_friend_with
- 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(: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(: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))
end
def test_users_nearby
@@ -132,13 +132,13 @@ class UserTest < ActiveSupport::TestCase
assert_equal [sec], norm.nearby
assert_equal 1, norm.nearby.size
assert_equal 1, Friend.count
- 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(: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(:public_user))
+ assert norm.is_friends_with?(sec)
+ assert !sec.is_friends_with?(norm)
+ 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))
#Friend.delete(friend)
#assert_equal 0, Friend.count
end