X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b70da7b8ea15ab48bb2f34155567cea6dffc8fc9..8ecb2c79f7146ecbb69d08cd38954836dc6d1b4c:/test/models/user_test.rb?ds=inline
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 4c863272b..42949504f 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -4,43 +4,36 @@ class UserTest < ActiveSupport::TestCase
include Rails::Dom::Testing::Assertions::SelectorAssertions
def test_invalid_with_empty_attributes
- user = User.new
- 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].none?
- assert user.errors[:home_lon].none?
- assert user.errors[:home_zoom].none?
+ user = build(:user, :email => nil,
+ :pass_crypt => nil,
+ :display_name => nil,
+ :home_lat => nil,
+ :home_lon => nil,
+ :home_zoom => nil)
+ assert_not_predicate user, :valid?
+ assert_predicate user.errors[:email], :any?
+ assert_predicate user.errors[:pass_crypt], :any?
+ assert_predicate user.errors[:display_name], :any?
+ assert_predicate user.errors[:home_lat], :none?
+ assert_predicate user.errors[:home_lon], :none?
+ assert_predicate user.errors[:home_zoom], :none?
end
def test_unique_email
existing_user = create(:user)
- new_user = User.new(
- :email => existing_user.email,
- :status => "active",
- :pass_crypt => Digest::MD5.hexdigest("test"),
- :display_name => "new user",
- :data_public => 1,
- :description => "desc"
- )
+ new_user = build(:user, :email => existing_user.email)
assert_not new_user.save
assert_includes new_user.errors[:email], "has already been taken"
end
def test_unique_display_name
- existing_user = create(:user)
- new_user = User.new(
- :email => "tester@openstreetmap.org",
- :status => "pending",
- :pass_crypt => Digest::MD5.hexdigest("test"),
- :display_name => existing_user.display_name,
- :data_public => 1,
- :description => "desc"
- )
- assert_not new_user.save
- assert_includes new_user.errors[:display_name], "has already been taken"
+ create(:user, :display_name => "H\u{e9}nryIV")
+
+ %W[H\u{e9}nryIV he\u{301}nryiv H\u{c9}nry\u2163 he\u{301}nry\u2173].each do |name|
+ new_user = build(:user, :display_name => name)
+ assert_not new_user.save
+ assert_includes new_user.errors[:display_name], "has already been taken"
+ end
end
def test_email_valid
@@ -65,18 +58,18 @@ class UserTest < ActiveSupport::TestCase
def test_display_name_length
user = build(:user)
user.display_name = "123"
- assert user.valid?, "should allow 3 char name name"
+ assert_predicate user, :valid?, "should allow 3 char name name"
user.display_name = "12"
- assert_not user.valid?, "should not allow 2 char name"
+ assert_not_predicate user, :valid?, "should not allow 2 char name"
user.display_name = ""
- assert_not user.valid?, "should not allow blank/0 char name"
+ assert_not_predicate user, :valid?, "should not allow blank/0 char name"
user.display_name = nil
- assert_not user.valid?, "should not allow nil value"
+ assert_not_predicate user, :valid?, "should not allow nil value"
end
def test_display_name_valid
# Due to sanitisation in the view some of these that you might not
- # expact are allowed
+ # expect are allowed
# However, would they affect the xml planet dumps?
ok = ["Name", "'me", "he\"", "
", "*ho", "\"help\"@",
"vergröÃern", "ã«ã·ã¹ãã ã«ã対å¿ãã¾ã", "è¼è§¸ææçéæ²", "space space"]
@@ -91,28 +84,58 @@ class UserTest < ActiveSupport::TestCase
ok.each do |display_name|
user = build(:user)
user.display_name = display_name
- assert user.valid?, "#{display_name} is invalid, when it should be"
+ assert_predicate user, :valid?, "#{display_name} is invalid, when it should be"
end
bad.each do |display_name|
user = build(:user)
user.display_name = display_name
- assert_not user.valid?, "#{display_name} is valid when it shouldn't be"
+ assert_not_predicate user, :valid?, "#{display_name} is valid when it shouldn't be"
end
end
+ def test_display_name_user_id_new
+ existing_user = create(:user)
+ user = build(:user)
+
+ user.display_name = "user_#{existing_user.id}"
+ assert_not user.valid?, "user_ name is valid for existing user id when it shouldn't be"
+
+ user.display_name = "user_#{existing_user.id + 1}"
+ assert_not user.valid?, "user_ name is valid for new user id when it shouldn't be"
+ end
+
+ def test_display_name_user_id_rename
+ existing_user = create(:user)
+ user = create(:user)
+
+ user.display_name = "user_#{existing_user.id}"
+ assert_not user.valid?, "user_ name is valid for existing user id when it shouldn't be"
+
+ user.display_name = "user_#{user.id}"
+ assert_predicate user, :valid?, "user_ name is invalid for own id, when it should be"
+ end
+
+ def test_display_name_user_id_unchanged_is_valid
+ user = build(:user, :display_name => "user_0")
+ user.save(:validate => false)
+ user.reload
+
+ assert_predicate user, :valid?, "user_0 display_name is invalid but it hasn't been changed"
+ end
+
def test_friends_with
alice = create(:user, :active)
bob = create(:user, :active)
charlie = create(:user, :active)
create(:friendship, :befriender => alice, :befriendee => bob)
- assert alice.is_friends_with?(bob)
- 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)
+ assert alice.friends_with?(bob)
+ assert_not alice.friends_with?(charlie)
+ assert_not bob.friends_with?(alice)
+ assert_not bob.friends_with?(charlie)
+ assert_not charlie.friends_with?(bob)
+ assert_not charlie.friends_with?(alice)
end
def test_users_nearby
@@ -224,48 +247,130 @@ class UserTest < ActiveSupport::TestCase
end
def test_visible?
- assert build(:user, :pending).visible?
- assert build(:user, :active).visible?
- assert build(:user, :confirmed).visible?
- assert_not build(:user, :suspended).visible?
- assert_not build(:user, :deleted).visible?
+ assert_predicate build(:user, :pending), :visible?
+ assert_predicate build(:user, :active), :visible?
+ assert_predicate build(:user, :confirmed), :visible?
+ assert_not_predicate build(:user, :suspended), :visible?
+ assert_not_predicate build(:user, :deleted), :visible?
end
def test_active?
- assert_not build(:user, :pending).active?
- assert build(:user, :active).active?
- assert build(:user, :confirmed).active?
- assert_not build(:user, :suspended).active?
- assert_not build(:user, :deleted).active?
+ assert_not_predicate build(:user, :pending), :active?
+ assert_predicate build(:user, :active), :active?
+ assert_predicate build(:user, :confirmed), :active?
+ assert_not_predicate build(:user, :suspended), :active?
+ assert_not_predicate build(:user, :deleted), :active?
end
def test_moderator?
- assert_not create(:user).moderator?
- assert create(:moderator_user).moderator?
+ assert_not_predicate create(:user), :moderator?
+ assert_predicate create(:moderator_user), :moderator?
end
def test_administrator?
- assert_not create(:user).administrator?
- assert create(:administrator_user).administrator?
+ assert_not_predicate create(:user), :administrator?
+ assert_predicate create(:administrator_user), :administrator?
end
- def test_has_role?
- assert_not create(:user).has_role?("administrator")
- assert_not create(:user).has_role?("moderator")
- assert create(:administrator_user).has_role?("administrator")
- assert create(:moderator_user).has_role?("moderator")
+ def test_role?
+ assert_not create(:user).role?("administrator")
+ assert_not create(:user).role?("moderator")
+ assert create(:administrator_user).role?("administrator")
+ assert create(:moderator_user).role?("moderator")
end
- def test_delete
+ def test_soft_destroy
user = create(:user, :with_home_location, :description => "foo")
- user.delete
+ user.soft_destroy
assert_equal "user_#{user.id}", user.display_name
- assert user.description.blank?
+ assert_predicate user.description, :blank?
assert_nil user.home_lat
assert_nil user.home_lon
- assert_not user.avatar.attached?
+ assert_not_predicate user.avatar, :attached?
assert_equal "deleted", user.status
- assert_not user.visible?
- assert_not user.active?
+ assert_not_predicate user, :visible?
+ assert_not_predicate user, :active?
+ end
+
+ def test_soft_destroy_revokes_oauth1_tokens
+ user = create(:user)
+ access_token = create(:access_token, :user => user)
+ assert_equal 1, user.oauth_tokens.authorized.count
+
+ user.soft_destroy
+
+ assert_equal 0, user.oauth_tokens.authorized.count
+ access_token.reload
+ assert_predicate access_token, :invalidated?
+ end
+
+ def test_soft_destroy_revokes_oauth2_tokens
+ user = create(:user)
+ oauth_access_token = create(:oauth_access_token, :resource_owner_id => user.id)
+ assert_equal 1, user.access_tokens.not_expired.count
+
+ user.soft_destroy
+
+ assert_equal 0, user.access_tokens.not_expired.count
+ oauth_access_token.reload
+ assert_predicate oauth_access_token, :revoked?
+ end
+
+ def test_deletion_allowed_when_no_changesets
+ with_user_account_deletion_delay(10000) do
+ user = create(:user)
+ assert_predicate user, :deletion_allowed?
+ end
+ end
+
+ def test_deletion_allowed_without_delay
+ with_user_account_deletion_delay(nil) do
+ user = create(:user)
+ create(:changeset, :user => user)
+ user.reload
+ assert_predicate user, :deletion_allowed?
+ end
+ end
+
+ def test_deletion_allowed_past_delay
+ with_user_account_deletion_delay(10) do
+ user = create(:user)
+ create(:changeset, :user => user, :created_at => Time.now.utc - 12.hours, :closed_at => Time.now.utc - 10.hours)
+ user.reload
+ assert_predicate user, :deletion_allowed?
+ end
+ end
+
+ def test_deletion_allowed_during_delay
+ with_user_account_deletion_delay(10) do
+ user = create(:user)
+ create(:changeset, :user => user, :created_at => Time.now.utc - 11.hours, :closed_at => Time.now.utc - 9.hours)
+ user.reload
+ assert_not_predicate user, :deletion_allowed?
+ assert_equal Time.now.utc + 1.hour, user.deletion_allowed_at
+ end
+ end
+
+ def test_deletion_allowed_past_zero_delay
+ with_user_account_deletion_delay(0) do
+ user = create(:user)
+ create(:changeset, :user => user, :created_at => Time.now.utc, :closed_at => Time.now.utc + 1.hour)
+ travel 90.minutes do
+ user.reload
+ assert_predicate user, :deletion_allowed?
+ end
+ end
+ end
+
+ def test_deletion_allowed_during_zero_delay
+ with_user_account_deletion_delay(0) do
+ user = create(:user)
+ create(:changeset, :user => user, :created_at => Time.now.utc, :closed_at => Time.now.utc + 1.hour)
+ travel 30.minutes do
+ user.reload
+ assert_not_predicate user, :deletion_allowed?
+ assert_equal Time.now.utc + 30.minutes, user.deletion_allowed_at
+ end
+ end
end
end