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,
- :status => "active",
+ :status => "active",
:pass_crypt => Digest::MD5.hexdigest('test'),
:display_name => "new user",
:data_public => 1,
assert !new_user.save
assert new_user.errors[:email].include?("has already been taken")
end
-
+
def test_unique_display_name
new_user = User.new(
:email => "tester@openstreetmap.org",
:status => "pending",
:pass_crypt => Digest::MD5.hexdigest('test'),
- :display_name => users(:normal_user).display_name,
+ :display_name => users(:normal_user).display_name,
:data_public => 1,
:description => "desc"
)
assert !new_user.save
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 }
- bad = %w{ hi ht@ n@ @.com help@.me.uk help"hi.me.uk も対@応します
- 輕觸搖晃的遊戲@ah.com も対応します@s.name }
-
+ ok = %w(a@s.com test@shaunmcdonald.me.uk hello_local@ping-d.ng
+ 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)
+
ok.each do |name|
user = users(:normal_user)
user.email = name
assert user.valid?(:save), user.errors.full_messages.join(",")
end
-
+
bad.each do |name|
user = users(:normal_user)
user.email = name
- assert user.invalid?(:save), "#{name} is valid when it shouldn't be"
+ assert user.invalid?(:save), "#{name} is valid when it shouldn't be"
end
end
-
+
def test_display_name_length
user = users(:normal_user)
user.display_name = "123"
user.display_name = ""
assert !user.valid?
user.display_name = nil
- # Don't understand why it isn't allowing a nil value,
+ # Don't understand why it isn't allowing a nil value,
# when the validates statements specifically allow it
# It appears the database does not allow null values
assert !user.valid?
end
-
+
def test_display_name_valid
- # Due to sanitisation in the view some of these that you might not
+ # 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\"", "<hr>", "*ho", "\"help\"@",
- "vergrößern", "ルシステムにも対応します", "輕觸搖晃的遊戲" ]
+ ok = ["Name", "'me", "he\"", "<hr>", "*ho", "\"help\"@",
+ "vergrößern", "ルシステムにも対応します", "輕觸搖晃的遊戲"]
# These need to be 3 chars in length, otherwise the length test above
# should be used.
- bad = [ "<hr/>", "test@example.com", "s/f", "aa/", "aa;", "aa.",
- "aa,", "aa?", "/;.,?", "も対応します/", "#ping" ]
+ bad = ["<hr/>", "test@example.com", "s/f", "aa/", "aa;", "aa.",
+ "aa,", "aa?", "/;.,?", "も対応します/", "#ping",
+ "foo\x1fbar", "foo\x7fbar", "foo\ufffebar", "foo\uffffbar",
+ "new", "terms", "save", "confirm", "confirm-email",
+ "go_public", "reset-password", "forgot-password", "suspended"]
ok.each do |display_name|
user = users(:normal_user)
user.display_name = display_name
assert user.valid?, "#{display_name} is invalid, when it should be"
end
-
+
bad.each do |display_name|
user = users(:normal_user)
user.display_name = display_name
assert !user.valid?, "#{display_name} is valid when it shouldn't be"
- assert user.errors[:display_name].include?("is invalid")
end
end
-
+
def test_friend_with
assert users(:normal_user).is_friends_with?(users(:public_user))
assert !users(:normal_user).is_friends_with?(users(:inactive_user))
assert_equal 1, Friend.count
norm = users(:normal_user)
sec = users(:public_user)
- #friend = Friend.new
- #friend.befriender = norm
- #friend.befriendee = sec
- #friend.save
+ # 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 !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
+ # Friend.delete(friend)
+ # assert_equal 0, Friend.count
end
def test_user_preferred_editor
end
end
- def test_public
- assert_equal 16, User.public.count
+ def test_identifiable
+ assert_equal 16, User.identifiable.count
assert_raise ActiveRecord::RecordNotFound do
- User.public.find(users(:normal_user).id)
+ User.identifiable.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 ["en"], user.languages
+ user.languages = %w(de fr en)
+ assert_equal %w(de fr en), user.languages
+ user.languages = %w(fr de sl)
assert_equal "de", user.preferred_language
- assert_equal "de", user.preferred_language_from(["en", "sl", "de", "es"])
+ assert_equal "de", user.preferred_language_from(%w(en sl de es))
end
def test_visible?
projects / rails.git / blobdiff