X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cbea796ef412840af9a3ec2fd26bf08657fc4cd3..5a0e0b2407823f501977d362ddc09664d9fa2f3f:/test/models/user_test.rb diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 96c6632ff..6836c4f70 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 new_user.errors[:email].include?("has already been taken") + 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 new_user.errors[:display_name].include?("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 @@ -52,7 +45,7 @@ class UserTest < ActiveSupport::TestCase ok.each do |name| user = build(:user) user.email = name - assert user.valid?(:save), user.errors.full_messages.join(",") + assert user.valid?(:save), "#{name} isn't valid when it should be" end bad.each do |name| @@ -65,18 +58,30 @@ 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_width + user = build(:user) + user.display_name = "123" + assert_predicate user, :valid?, "should allow 3 column name name" + user.display_name = "12" + assert_not_predicate user, :valid?, "should not allow 2 column name" + user.display_name = "1\u{200B}2" + assert_not_predicate user, :valid?, "should not allow 2 column name" + user.display_name = "\u{200B}\u{200B}\u{200B}" + assert_not_predicate user, :valid?, "should not allow 0 column name" 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 +96,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_predicate 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_predicate 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_predicate 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 @@ -129,11 +164,11 @@ class UserTest < ActiveSupport::TestCase # 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 + assert_empty david.nearby # south_pole_user has no user nearby, and doesn't throw exception - assert_equal [], south_pole_user.nearby + assert_empty south_pole_user.nearby # vagrant_user has no home location - assert_equal [], vagrant_user.nearby + assert_empty vagrant_user.nearby end def test_friends @@ -144,15 +179,15 @@ class UserTest < ActiveSupport::TestCase assert_equal [sec], norm.friends assert_equal 1, norm.friends.size - assert_equal [], sec.friends + assert_empty sec.friends assert_equal 0, sec.friends.size end def test_user_preferred_editor user = create(:user) assert_nil user.preferred_editor - user.preferred_editor = "potlatch" - assert_equal "potlatch", user.preferred_editor + user.preferred_editor = "id" + assert_equal "id", user.preferred_editor user.save! user.preferred_editor = "invalid_editor" @@ -224,68 +259,118 @@ class UserTest < ActiveSupport::TestCase end def test_visible? - assert_equal true, build(:user, :pending).visible? - assert_equal true, build(:user, :active).visible? - assert_equal true, build(:user, :confirmed).visible? - assert_equal false, build(:user, :suspended).visible? - assert_equal false, 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_equal false, build(:user, :pending).active? - assert_equal true, build(:user, :active).active? - assert_equal true, build(:user, :confirmed).active? - assert_equal false, build(:user, :suspended).active? - assert_equal false, 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_equal false, create(:user).moderator? - assert_equal true, create(:moderator_user).moderator? + assert_not_predicate create(:user), :moderator? + assert_predicate create(:moderator_user), :moderator? end def test_administrator? - assert_equal false, create(:user).administrator? - assert_equal true, create(:administrator_user).administrator? + assert_not_predicate create(:user), :administrator? + assert_predicate create(:administrator_user), :administrator? end - def test_has_role? - assert_equal false, create(:user).has_role?("administrator") - assert_equal false, create(:user).has_role?("moderator") - assert_equal true, create(:administrator_user).has_role?("administrator") - assert_equal true, 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_equal false, user.image.file? + assert_not_predicate user.avatar, :attached? assert_equal "deleted", user.status - assert_equal false, user.visible? - assert_equal false, user.active? + assert_not_predicate user, :visible? + assert_not_predicate user, :active? + 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_to_xml - user = build(:user, :with_home_location) - xml = user.to_xml - assert_select Nokogiri::XML::Document.parse(xml.to_s), "user" do - assert_select "[display_name=?]", user.display_name - assert_select "[account_created=?]", user.creation_time.xmlschema - assert_select "home[lat=?][lon=?][zoom=?]", user.home_lat.to_s, user.home_lon.to_s, user.home_zoom.to_s + 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_to_xml_node - user = build(:user, :with_home_location) - xml = user.to_xml_node - assert_select Nokogiri::XML::DocumentFragment.parse(xml.to_s), "user" do - assert_select "[display_name=?]", user.display_name - assert_select "[account_created=?]", user.creation_time.xmlschema - assert_select "home[lat=?][lon=?][zoom=?]", user.home_lat.to_s, user.home_lon.to_s, user.home_zoom.to_s + 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