X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3b26ff0c40fa127e0d0732bce3d7116e2fa7695d..5a54cb52f8b46283ddb6059e53f0d49886983ccf:/test/models/user_test.rb?ds=inline
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 43ccb6a45..2368960e1 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -1,22 +1,18 @@
-# -*- coding: utf-8 -*-
require "test_helper"
class UserTest < ActiveSupport::TestCase
include Rails::Dom::Testing::Assertions::SelectorAssertions
- api_fixtures
- fixtures :user_roles
-
def test_invalid_with_empty_attributes
user = User.new
- assert !user.valid?
+ assert_not user.valid?
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?
+ assert user.errors[:home_lat].none?
+ assert user.errors[:home_lon].none?
+ assert user.errors[:home_zoom].none?
end
def test_unique_email
@@ -29,7 +25,7 @@ class UserTest < ActiveSupport::TestCase
:data_public => 1,
:description => "desc"
)
- assert !new_user.save
+ assert_not new_user.save
assert new_user.errors[:email].include?("has already been taken")
end
@@ -43,15 +39,15 @@ class UserTest < ActiveSupport::TestCase
:data_public => 1,
:description => "desc"
)
- assert !new_user.save
+ assert_not 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 = build(:user)
@@ -69,16 +65,13 @@ class UserTest < ActiveSupport::TestCase
def test_display_name_length
user = build(:user)
user.display_name = "123"
- assert user.valid?, " should allow nil display name"
+ assert user.valid?, "should allow 3 char name name"
user.display_name = "12"
- assert !user.valid?, "should not allow 2 char name"
+ assert_not user.valid?, "should not allow 2 char name"
user.display_name = ""
- assert !user.valid?
+ assert_not user.valid?, "should not allow blank/0 char name"
user.display_name = nil
- # 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?
+ assert_not user.valid?, "should not allow nil value"
end
def test_display_name_valid
@@ -86,14 +79,15 @@ class UserTest < ActiveSupport::TestCase
# expact are allowed
# However, would they affect the xml planet dumps?
ok = ["Name", "'me", "he\"", "
", "*ho", "\"help\"@",
- "vergröÃern", "ã«ã·ã¹ãã ã«ã対å¿ãã¾ã", "è¼è§¸ææçéæ²"]
+ "vergröÃern", "ã«ã·ã¹ãã ã«ã対å¿ãã¾ã", "è¼è§¸ææçéæ²", "space space"]
# 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?", "/;.,?", "ã対å¿ãã¾ã/", "#ping",
"foo\x1fbar", "foo\x7fbar", "foo\ufffebar", "foo\uffffbar",
"new", "terms", "save", "confirm", "confirm-email",
- "go_public", "reset-password", "forgot-password", "suspended"]
+ "go_public", "reset-password", "forgot-password", "suspended",
+ "trailing whitespace ", " leading whitespace"]
ok.each do |display_name|
user = build(:user)
user.display_name = display_name
@@ -103,7 +97,7 @@ class UserTest < ActiveSupport::TestCase
bad.each do |display_name|
user = build(:user)
user.display_name = display_name
- assert !user.valid?, "#{display_name} is valid when it shouldn't be"
+ assert_not user.valid?, "#{display_name} is valid when it shouldn't be"
end
end
@@ -111,39 +105,47 @@ class UserTest < ActiveSupport::TestCase
alice = create(:user, :active)
bob = create(:user, :active)
charlie = create(:user, :active)
- create(:friend, :befriender => alice, :befriendee => bob)
+ create(:friendship, :befriender => alice, :befriendee => bob)
assert alice.is_friends_with?(bob)
- assert !alice.is_friends_with?(charlie)
- assert !bob.is_friends_with?(alice)
- assert !bob.is_friends_with?(charlie)
- assert !charlie.is_friends_with?(bob)
- assert !charlie.is_friends_with?(alice)
+ assert_not alice.is_friends_with?(charlie)
+ assert_not bob.is_friends_with?(alice)
+ assert_not bob.is_friends_with?(charlie)
+ assert_not charlie.is_friends_with?(bob)
+ assert_not charlie.is_friends_with?(alice)
end
def test_users_nearby
- # second user has their data public and is close by normal user
- assert_equal [users(:public_user), users(:german_user)], users(:normal_user).nearby
- # second_user has normal user nearby, but normal user has their data private
- assert_equal [users(:german_user)], users(:public_user).nearby
- # inactive_user has no user nearby
- assert_equal [], users(:inactive_user).nearby
- # north_pole_user has no user nearby, and doesn't throw exception
- assert_equal [], users(:north_pole_user).nearby
- # confirmed_user has no home location
- assert_equal [], users(:confirmed_user).nearby
+ alice = create(:user, :active, :home_lat => 51.0, :home_lon => 1.0, :data_public => false)
+ bob = create(:user, :active, :home_lat => 51.1, :home_lon => 1.0, :data_public => true)
+ charlie = create(:user, :active, :home_lat => 51.1, :home_lon => 1.1, :data_public => true)
+ david = create(:user, :active, :home_lat => 10.0, :home_lon => -123.0, :data_public => true)
+ _edward = create(:user, :suspended, :home_lat => 10.0, :home_lon => -123.0, :data_public => true)
+ south_pole_user = create(:user, :active, :home_lat => -90.0, :home_lon => 0.0, :data_public => true)
+ vagrant_user = create(:user, :active, :home_lat => nil, :home_lon => nil, :data_public => true)
+
+ # bob and charlie are both near alice
+ assert_equal [bob, charlie], alice.nearby
+ # charlie and alice are both near bob, but alice has their data private
+ assert_equal [charlie], bob.nearby
+ # david has no user nearby, since edward is not active
+ assert_equal [], david.nearby
+ # south_pole_user has no user nearby, and doesn't throw exception
+ assert_equal [], south_pole_user.nearby
+ # vagrant_user has no home location
+ assert_equal [], vagrant_user.nearby
end
- def test_friend_users
+ def test_friends
norm = create(:user, :active)
sec = create(:user, :active)
- create(:friend, :befriender => norm, :befriendee => sec)
+ create(:friendship, :befriender => norm, :befriendee => sec)
- assert_equal [sec], norm.friend_users
- assert_equal 1, norm.friend_users.size
+ assert_equal [sec], norm.friends
+ assert_equal 1, norm.friends.size
- assert_equal [], sec.friend_users
- assert_equal 0, sec.friend_users.size
+ assert_equal [], sec.friends
+ assert_equal 0, sec.friends.size
end
def test_user_preferred_editor
@@ -212,13 +214,13 @@ class UserTest < ActiveSupport::TestCase
user = create(:user, :languages => ["en"])
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)
+ 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 %w(fr de sl), user.preferred_languages.map(&:to_s)
- user = create(:user, :languages => %w(en de))
- assert_equal %w(en de), user.languages
+ assert_equal %w[fr de sl], user.preferred_languages.map(&:to_s)
+ user = create(:user, :languages => %w[en de])
+ assert_equal %w[en de], user.languages
end
def test_visible?
@@ -261,7 +263,7 @@ class UserTest < ActiveSupport::TestCase
assert user.description.blank?
assert_nil user.home_lat
assert_nil user.home_lon
- assert_equal false, user.image.file?
+ assert_equal false, user.avatar.attached?
assert_equal "deleted", user.status
assert_equal false, user.visible?
assert_equal false, user.active?