X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e1d873cde99eaa6eafaca6659c221ec2b98de36e..681022443ea24c11d9aeedeb3e1ddc3789b8ffd5:/test/unit/user_test.rb
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index bc0b7573b..1283f4168 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -18,27 +18,27 @@ class UserTest < ActiveSupport::TestCase
end
def test_unique_email
- new_user = User.new({
+ new_user = User.new(
:email => users(:normal_user).email,
:status => "active",
:pass_crypt => Digest::MD5.hexdigest('test'),
:display_name => "new user",
:data_public => 1,
:description => "desc"
- }, :without_protection => true)
+ )
assert !new_user.save
assert new_user.errors[:email].include?("has already been taken")
end
def test_unique_display_name
- new_user = User.new({
+ new_user = User.new(
:email => "tester@openstreetmap.org",
:status => "pending",
:pass_crypt => Digest::MD5.hexdigest('test'),
:display_name => users(:normal_user).display_name,
:data_public => 1,
:description => "desc"
- }, :without_protection => true)
+ )
assert !new_user.save
assert new_user.errors[:display_name].include?("has already been taken")
end
@@ -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
@@ -155,7 +155,7 @@ class UserTest < ActiveSupport::TestCase
end
def test_visible
- assert_equal 13, User.visible.count
+ assert_equal 14, User.visible.count
assert_raise ActiveRecord::RecordNotFound do
User.visible.find(users(:suspended_user).id)
end
@@ -165,7 +165,7 @@ class UserTest < ActiveSupport::TestCase
end
def test_active
- assert_equal 12, User.active.count
+ assert_equal 13, User.active.count
assert_raise ActiveRecord::RecordNotFound do
User.active.find(users(:inactive_user).id)
end
@@ -178,7 +178,7 @@ class UserTest < ActiveSupport::TestCase
end
def test_public
- assert_equal 14, User.public.count
+ assert_equal 15, User.public.count
assert_raise ActiveRecord::RecordNotFound do
User.public.find(users(:normal_user).id)
end
@@ -231,7 +231,7 @@ class UserTest < ActiveSupport::TestCase
user = users(:normal_user)
user.delete
assert_equal "user_#{user.id}", user.display_name
- assert_blank user.description
+ assert user.description.blank?
assert_equal nil, user.home_lat
assert_equal nil, user.home_lon
assert_equal false, user.image.file?