X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..edfbbf7336a38162b2d996ebca21918a5d6039a0:/test/models/user_test.rb?ds=inline diff --git a/test/models/user_test.rb b/test/models/user_test.rb index b517fd2af..b3e6eae8f 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,7 +1,9 @@ # -*- 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 @@ -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" @@ -114,13 +116,15 @@ 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 @@ -133,8 +137,8 @@ class UserTest < ActiveSupport::TestCase # friend.befriender = norm # friend.befriendee = sec # friend.save - assert_equal [sec], norm.nearby - assert_equal 1, norm.nearby.size + 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) @@ -159,7 +163,7 @@ class UserTest < ActiveSupport::TestCase end def test_visible - assert_equal 15, User.visible.count + assert_equal 19, User.visible.count assert_raise ActiveRecord::RecordNotFound do User.visible.find(users(:suspended_user).id) end @@ -169,7 +173,7 @@ class UserTest < ActiveSupport::TestCase end def test_active - assert_equal 14, User.active.count + assert_equal 18, User.active.count assert_raise ActiveRecord::RecordNotFound do User.active.find(users(:inactive_user).id) end @@ -182,7 +186,7 @@ class UserTest < ActiveSupport::TestCase end def test_identifiable - assert_equal 16, User.identifiable.count + assert_equal 20, User.identifiable.count assert_raise ActiveRecord::RecordNotFound do User.identifiable.find(users(:normal_user).id) end @@ -196,6 +200,8 @@ class UserTest < ActiveSupport::TestCase user.languages = %w(fr de sl) assert_equal "de", user.preferred_language assert_equal "de", user.preferred_language_from(%w(en sl de es)) + user = users(:public_user) + assert_equal %w(en de), user.languages end def test_visible? @@ -243,4 +249,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