X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7406ae5dcc9cbb177a8ea33085af9caf6e3ebb1b..4d6df34c4bca932b75f2260fe533b4d22c3651f9:/test/models/user_test.rb diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 42949504f..6836c4f70 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -67,6 +67,18 @@ class UserTest < ActiveSupport::TestCase 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 # expect are allowed @@ -99,10 +111,10 @@ class UserTest < ActiveSupport::TestCase 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" + 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 user.valid?, "user_ name is valid for new user id when it shouldn't be" + 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 @@ -110,7 +122,7 @@ class UserTest < ActiveSupport::TestCase 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" + 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" @@ -292,18 +304,6 @@ class UserTest < ActiveSupport::TestCase 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)