X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cb3c4ec09b70e7eae62494af795187b32128fd0c..ef092045e095d7d0745964b50466dc55499bf718:/test/models/user_test.rb diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 168b9c3fa..4c863272b 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -26,7 +26,7 @@ class UserTest < ActiveSupport::TestCase :description => "desc" ) 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 @@ -40,7 +40,7 @@ class UserTest < ActiveSupport::TestCase :description => "desc" ) assert_not new_user.save - assert new_user.errors[:display_name].include?("has already been taken") + assert_includes new_user.errors[:display_name], "has already been taken" end def test_email_valid @@ -52,7 +52,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,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_not 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_not user.valid? + assert_not user.valid?, "should not allow nil value" end def test_display_name_valid @@ -82,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 @@ -99,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 @@ -107,7 +105,7 @@ 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_not alice.is_friends_with?(charlie) @@ -131,30 +129,30 @@ 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_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_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" @@ -226,36 +224,36 @@ 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 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? 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 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? end def test_moderator? - assert_equal false, create(:user).moderator? - assert_equal true, create(:moderator_user).moderator? + assert_not create(:user).moderator? + assert create(:moderator_user).moderator? end def test_administrator? - assert_equal false, create(:user).administrator? - assert_equal true, create(:administrator_user).administrator? + assert_not create(:user).administrator? + assert 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") + 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") end def test_delete @@ -265,29 +263,9 @@ 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_not user.avatar.attached? assert_equal "deleted", user.status - assert_equal false, user.visible? - assert_equal false, user.active? - 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 - 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 - end + assert_not user.visible? + assert_not user.active? end end