X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6dfc83da03e77615c958af8f2992f2d6ef44f11b..d95361bcb9d1efccae1da3e295e426dfd44ddd89:/test/unit/user_test.rb
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 486344fee..1283f4168 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -1,58 +1,64 @@
+# -*- coding: utf-8 -*-
require File.dirname(__FILE__) + '/../test_helper'
-class UserTest < Test::Unit::TestCase
- fixtures :users
-
+class UserTest < ActiveSupport::TestCase
+ api_fixtures
+ fixtures :friends, :languages, :user_roles
+
def test_invalid_with_empty_attributes
user = User.new
assert !user.valid?
- assert user.errors.invalid?(:email)
- assert user.errors.invalid?(:pass_crypt)
- assert user.errors.invalid?(:display_name)
- assert user.errors.invalid?(:email)
- assert !user.errors.invalid?(:home_lat)
- assert !user.errors.invalid?(:home_lon)
- assert !user.errors.invalid?(:home_zoom)
+ assert user.errors[:email].any?
+ assert user.errors[:pass_crypt].any?
+ assert user.errors[:display_name].any?
+ assert user.errors[:email].any?
+ assert !user.errors[:home_lat].any?
+ assert !user.errors[:home_lon].any?
+ assert !user.errors[:home_zoom].any?
end
def test_unique_email
- new_user = User.new(:email => users(:normal_user).email,
- :active => 1,
+ 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")
+ :description => "desc"
+ )
assert !new_user.save
- assert_equal ActiveRecord::Errors.default_error_messages[:taken], new_user.errors.on(:email)
+ assert new_user.errors[:email].include?("has already been taken")
end
def test_unique_display_name
- new_user = User.new(:email => "tester@openstreetmap.org",
- :active => 0,
+ 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")
+ :description => "desc"
+ )
assert !new_user.save
- assert_equal ActiveRecord::Errors.default_error_messages[:taken], new_user.errors.on(:display_name)
+ assert new_user.errors[:display_name].include?("has already been taken")
end
def test_email_valid
ok = %w{ a@s.com test@shaunmcdonald.me.uk hello_local@ping-d.ng
- test_local@openstreetmap.org test-local@example.com
+ test_local@openstreetmap.org test-local@example.com }
+ bad = %w{ hi ht@ n@ @.com help@.me.uk help"hi.me.uk ã対@å¿ãã¾ã
è¼è§¸ææçéæ²@ah.com ã対å¿ãã¾ã@s.name }
- bad = %w{ hi ht@ n@ @.com help@.me.uk help"hi.me.uk ã対@å¿ãã¾ã }
ok.each do |name|
user = users(:normal_user)
user.email = name
- assert user.valid?, user.errors.full_messages
+ assert user.valid?(:save), user.errors.full_messages.join(",")
end
bad.each do |name|
user = users(:normal_user)
user.email = name
- assert !user.valid?, "#{name} is valid when it shouldn't be"
+ assert user.invalid?(:save), "#{name} is valid when it shouldn't be"
end
end
@@ -75,12 +81,12 @@ class UserTest < Test::Unit::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
@@ -91,49 +97,146 @@ class UserTest < Test::Unit::TestCase
user = users(:normal_user)
user.display_name = display_name
assert !user.valid?, "#{display_name} is valid when it shouldn't be"
- assert_equal "is invalid", user.errors.on(:display_name)
+ assert user.errors[:display_name].include?("is invalid")
end
end
def test_friend_with
- assert_equal false, users(:normal_user).is_friends_with?(users(:second_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(:inactive_user).is_friends_with?(users(:normal_user))
- assert_equal false, users(:inactive_user).is_friends_with?(users(:second_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
# 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
def test_friends_with
- # make normal user a friend of second user
+ # normal user is a friend of second user
# it should be a one way friend accossitation
- assert_equal 0, Friend.count
+ assert_equal 1, Friend.count
norm = users(:normal_user)
- sec = users(:second_user)
- friend = Friend.new
- friend.befriender = norm
- friend.befriendee = sec
- friend.save
+ sec = users(:public_user)
+ #friend = Friend.new
+ #friend.befriender = norm
+ #friend.befriendee = sec
+ #friend.save
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(:second_user).is_friends_with?(users(:normal_user))
- assert_equal false, users(:second_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))
- Friend.delete(friend)
- assert_equal 0, Friend.count
+ 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
+
+ def test_user_preferred_editor
+ user = users(:normal_user)
+ assert_equal nil, user.preferred_editor
+ user.preferred_editor = "potlatch"
+ assert_equal "potlatch", user.preferred_editor
+ user.save!
+
+ user.preferred_editor = "invalid_editor"
+ assert_raise(ActiveRecord::RecordInvalid) { user.save! }
+ end
+
+ def test_visible
+ assert_equal 14, User.visible.count
+ assert_raise ActiveRecord::RecordNotFound do
+ User.visible.find(users(:suspended_user).id)
+ end
+ assert_raise ActiveRecord::RecordNotFound do
+ User.visible.find(users(:deleted_user).id)
+ end
+ end
+
+ def test_active
+ assert_equal 13, User.active.count
+ assert_raise ActiveRecord::RecordNotFound do
+ User.active.find(users(:inactive_user).id)
+ end
+ assert_raise ActiveRecord::RecordNotFound do
+ User.active.find(users(:suspended_user).id)
+ end
+ assert_raise ActiveRecord::RecordNotFound do
+ User.active.find(users(:deleted_user).id)
+ end
+ end
+
+ def test_public
+ assert_equal 15, User.public.count
+ assert_raise ActiveRecord::RecordNotFound do
+ User.public.find(users(:normal_user).id)
+ end
+ end
+
+ def test_languages
+ user = users(:normal_user)
+ assert_equal [ "en" ], user.languages
+ user.languages = [ "de", "fr", "en" ]
+ assert_equal [ "de", "fr", "en" ], user.languages
+ user.languages = [ "fr", "de", "sl" ]
+ assert_equal "de", user.preferred_language
+ assert_equal "de", user.preferred_language_from(["en", "sl", "de", "es"])
+ end
+
+ def test_visible?
+ assert_equal true, users(:inactive_user).visible?
+ assert_equal true, users(:normal_user).visible?
+ assert_equal true, users(:confirmed_user).visible?
+ assert_equal false, users(:suspended_user).visible?
+ assert_equal false, users(:deleted_user).visible?
+ end
+
+ def test_active?
+ assert_equal false, users(:inactive_user).active?
+ assert_equal true, users(:normal_user).active?
+ assert_equal true, users(:confirmed_user).active?
+ assert_equal false, users(:suspended_user).active?
+ assert_equal false, users(:deleted_user).active?
+ end
+
+ def test_moderator?
+ assert_equal false, users(:normal_user).moderator?
+ assert_equal true, users(:moderator_user).moderator?
+ end
+
+ def test_administrator?
+ assert_equal false, users(:normal_user).administrator?
+ assert_equal true, users(:administrator_user).administrator?
+ end
+
+ def test_has_role?
+ assert_equal false, users(:normal_user).has_role?("administrator")
+ assert_equal false, users(:normal_user).has_role?("moderator")
+ assert_equal true, users(:administrator_user).has_role?("administrator")
+ assert_equal true, users(:moderator_user).has_role?("moderator")
+ end
+
+ def test_delete
+ user = users(:normal_user)
+ user.delete
+ assert_equal "user_#{user.id}", user.display_name
+ assert user.description.blank?
+ assert_equal nil, user.home_lat
+ assert_equal nil, user.home_lon
+ assert_equal false, user.image.file?
+ assert_equal "deleted", user.status
+ assert_equal false, user.visible?
+ assert_equal false, user.active?
end
end