X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..589e9802a94e6c6bb7b4cf1770eb4a32498e591f:/test/models/user_test.rb?ds=inline

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index b517fd2af..6ecc8c796 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"
@@ -50,20 +52,20 @@ class UserTest < ActiveSupport::TestCase
              輕觸搖晃的遊戲@ah.com も対応します@s.name)
 
     ok.each do |name|
-      user = users(:normal_user)
+      user = build(:user)
       user.email = name
       assert user.valid?(:save), user.errors.full_messages.join(",")
     end
 
     bad.each do |name|
-      user = users(:normal_user)
+      user = build(:user)
       user.email = name
       assert user.invalid?(:save), "#{name} is valid when it shouldn't be"
     end
   end
 
   def test_display_name_length
-    user = users(:normal_user)
+    user = build(:user)
     user.display_name = "123"
     assert user.valid?, " should allow nil display name"
     user.display_name = "12"
@@ -91,19 +93,20 @@ class UserTest < ActiveSupport::TestCase
            "new", "terms", "save", "confirm", "confirm-email",
            "go_public", "reset-password", "forgot-password", "suspended"]
     ok.each do |display_name|
-      user = users(:normal_user)
+      user = build(:user)
       user.display_name = display_name
       assert user.valid?, "#{display_name} is invalid, when it should be"
     end
 
     bad.each do |display_name|
-      user = users(:normal_user)
+      user = build(:user)
       user.display_name = display_name
       assert !user.valid?, "#{display_name} is valid when it shouldn't be"
     end
   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)
@@ -148,8 +150,8 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_user_preferred_editor
-    user = users(:normal_user)
-    assert_equal nil, user.preferred_editor
+    user = create(:user)
+    assert_nil user.preferred_editor
     user.preferred_editor = "potlatch"
     assert_equal "potlatch", user.preferred_editor
     user.save!
@@ -159,7 +161,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_visible
-    assert_equal 15, User.visible.count
+    assert_equal 23, 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 22, 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 24, 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 = %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(%w(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?
@@ -236,11 +244,31 @@ class UserTest < ActiveSupport::TestCase
     user.delete
     assert_equal "user_#{user.id}", user.display_name
     assert user.description.blank?
-    assert_equal nil, user.home_lat
-    assert_equal nil, user.home_lon
+    assert_nil user.home_lat
+    assert_nil user.home_lon
     assert_equal false, user.image.file?
     assert_equal "deleted", user.status
     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