X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/34e3e51456774127d43408b7ab65c24f41373f62..72855280e75474735d0c2b65aae55a68eda71462:/test/models/user_test.rb?ds=sidebyside diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 0f74f8f3e..d480849dd 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,9 +1,11 @@ # -*- coding: utf-8 -*- -require 'test_helper' +require "test_helper" class UserTest < ActiveSupport::TestCase + include Rails::Dom::Testing::Assertions::SelectorAssertions + api_fixtures - fixtures :friends, :languages, :user_roles + fixtures :user_roles def test_invalid_with_empty_attributes user = User.new @@ -21,7 +23,7 @@ class UserTest < ActiveSupport::TestCase new_user = User.new( :email => users(:normal_user).email, :status => "active", - :pass_crypt => Digest::MD5.hexdigest('test'), + :pass_crypt => Digest::MD5.hexdigest("test"), :display_name => "new user", :data_public => 1, :description => "desc" @@ -34,7 +36,7 @@ class UserTest < ActiveSupport::TestCase new_user = User.new( :email => "tester@openstreetmap.org", :status => "pending", - :pass_crypt => Digest::MD5.hexdigest('test'), + :pass_crypt => Digest::MD5.hexdigest("test"), :display_name => users(:normal_user).display_name, :data_public => 1, :description => "desc" @@ -44,10 +46,10 @@ class UserTest < ActiveSupport::TestCase 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 = users(:normal_user) @@ -81,15 +83,15 @@ class UserTest < ActiveSupport::TestCase # Due to sanitisation in the view some of these that you might not # expact are allowed # However, would they affect the xml planet dumps? - ok = [ "Name", "'me", "he\"", "
", "*ho", "\"help\"@", - "vergrößern", "ルシステムにも対応します", "輕觸搖晃的遊戲" ] + ok = ["Name", "'me", "he\"", "
", "*ho", "\"help\"@", + "vergrößern", "ルシステムにも対応します", "輕觸搖晃的遊戲"] # 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" ] + 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"] ok.each do |display_name| user = users(:normal_user) user.display_name = display_name @@ -104,6 +106,7 @@ class UserTest < ActiveSupport::TestCase end def test_friend_with + create(:friend, :befriender => users(:normal_user), :befriendee => users(:public_user)) assert users(:normal_user).is_friends_with?(users(:public_user)) assert !users(:normal_user).is_friends_with?(users(:inactive_user)) assert !users(:public_user).is_friends_with?(users(:normal_user)) @@ -114,27 +117,26 @@ class UserTest < ActiveSupport::TestCase def test_users_nearby # second user has their data public and is close by normal user - assert_equal [users(:public_user)], users(:normal_user).nearby + 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(:public_user).nearby + 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 end def test_friends_with # normal user is a friend of second user - # it should be a one way friend accossitation - assert_equal 1, Friend.count + # it should be a one way friend associatation norm = users(:normal_user) sec = users(:public_user) - #friend = Friend.new - #friend.befriender = norm - #friend.befriendee = sec - #friend.save - assert_equal [sec], norm.nearby - assert_equal 1, norm.nearby.size + create(:friend, :befriender => norm, :befriendee => sec) + assert_equal 1, Friend.count + assert_equal [sec], norm.friend_users + assert_equal 1, norm.friend_users.size assert_equal 1, Friend.count assert norm.is_friends_with?(sec) assert !sec.is_friends_with?(norm) @@ -143,8 +145,8 @@ class UserTest < ActiveSupport::TestCase assert !users(:public_user).is_friends_with?(users(:inactive_user)) assert !users(:inactive_user).is_friends_with?(users(:normal_user)) assert !users(:inactive_user).is_friends_with?(users(:public_user)) - #Friend.delete(friend) - #assert_equal 0, Friend.count + # Friend.delete(friend) + # assert_equal 0, Friend.count end def test_user_preferred_editor @@ -159,7 +161,7 @@ class UserTest < ActiveSupport::TestCase end def test_visible - assert_equal 15, User.visible.count + assert_equal 22, User.visible.count assert_raise ActiveRecord::RecordNotFound do User.visible.find(users(:suspended_user).id) end @@ -169,7 +171,7 @@ class UserTest < ActiveSupport::TestCase end def test_active - assert_equal 14, User.active.count + assert_equal 21, User.active.count assert_raise ActiveRecord::RecordNotFound do User.active.find(users(:inactive_user).id) end @@ -182,20 +184,26 @@ class UserTest < ActiveSupport::TestCase end def test_identifiable - assert_equal 16, User.identifiable.count + assert_equal 23, User.identifiable.count assert_raise ActiveRecord::RecordNotFound do User.identifiable.find(users(:normal_user).id) end end def test_languages + create(:language, :code => "en") + create(:language, :code => "de") + create(:language, :code => "sl") + user = users(:normal_user) - assert_equal [ "en" ], user.languages - user.languages = [ "de", "fr", "en" ] - assert_equal [ "de", "fr", "en" ], user.languages - user.languages = [ "fr", "de", "sl" ] + 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) assert_equal "de", user.preferred_language - assert_equal "de", user.preferred_language_from(["en", "sl", "de", "es"]) + assert_equal %w(fr de sl), user.preferred_languages.map(&:to_s) + user = users(:public_user) + assert_equal %w(en de), user.languages end def test_visible? @@ -243,4 +251,24 @@ class UserTest < ActiveSupport::TestCase assert_equal false, user.visible? assert_equal false, user.active? end + + def test_to_xml + user = users(:normal_user) + 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 = users(:normal_user) + 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 + end end