X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0dd0f1881db639b968ea9f8d864bfc95efed279d..5c0e96e0e0e99b3469c286f4bf77d4d0abf47c79:/test/unit/user_test.rb

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 02251b0ee..1283f4168 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -1,59 +1,64 @@
+# -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../test_helper'
 
-class UserTest < Test::Unit::TestCase
+class UserTest < ActiveSupport::TestCase
   api_fixtures
-  fixtures :friends
+  fixtures :friends, :languages, :user_roles
 
   def test_invalid_with_empty_attributes
     user = User.new
     assert !user.valid?
-    assert user.errors.invalid?(:email)
-    assert user.errors.invalid?(:pass_crypt)
-    assert user.errors.invalid?(:display_name)
-    assert user.errors.invalid?(:email)
-    assert !user.errors.invalid?(:home_lat)
-    assert !user.errors.invalid?(:home_lon)
-    assert !user.errors.invalid?(:home_zoom)
+    assert user.errors[:email].any?
+    assert user.errors[:pass_crypt].any?
+    assert user.errors[:display_name].any?
+    assert user.errors[:email].any?
+    assert !user.errors[:home_lat].any?
+    assert !user.errors[:home_lon].any?
+    assert !user.errors[:home_zoom].any?
   end
   
   def test_unique_email
-    new_user = User.new(:email => users(:normal_user).email,
-      :active => 1, 
+    new_user = User.new(
+      :email => users(:normal_user).email,
+      :status => "active", 
       :pass_crypt => Digest::MD5.hexdigest('test'),
       :display_name => "new user",
       :data_public => 1,
-      :description => "desc")
+      :description => "desc"
+    )
     assert !new_user.save
-    assert_equal ActiveRecord::Errors.default_error_messages[:taken], new_user.errors.on(:email)
+    assert new_user.errors[:email].include?("has already been taken")
   end
   
   def test_unique_display_name
-    new_user = User.new(:email => "tester@openstreetmap.org",
-      :active => 0,
+    new_user = User.new(
+      :email => "tester@openstreetmap.org",
+      :status => "pending",
       :pass_crypt => Digest::MD5.hexdigest('test'),
       :display_name => users(:normal_user).display_name, 
       :data_public => 1,
-      :description => "desc")
+      :description => "desc"
+    )
     assert !new_user.save
-    assert_equal ActiveRecord::Errors.default_error_messages[:taken], new_user.errors.on(:display_name)
+    assert new_user.errors[:display_name].include?("has already been taken")
   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
+    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 }
-    bad = %w{ hi ht@ n@ @.com help@.me.uk help"hi.me.uk も対@応します }
     
     ok.each do |name|
       user = users(:normal_user)
       user.email = name
-      assert user.valid?, user.errors.full_messages
+      assert user.valid?(:save), user.errors.full_messages.join(",")
     end
     
     bad.each do |name|
       user = users(:normal_user)
       user.email = name
-      assert !user.valid?, "#{name} is valid when it shouldn't be" 
+      assert user.invalid?(:save), "#{name} is valid when it shouldn't be" 
     end
   end
   
@@ -76,12 +81,12 @@ class UserTest < Test::Unit::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\"", "#ping", "<hr>", "*ho", "\"help\"@", 
+    ok = [ "Name", "'me", "he\"", "<hr>", "*ho", "\"help\"@", 
            "vergrößern", "ルシステムにも対応します", "輕觸搖晃的遊戲" ]
     # These need to be 3 chars in length, otherwise the length test above
     # should be used.
     bad = [ "<hr/>", "test@example.com", "s/f", "aa/", "aa;", "aa.",
-            "aa,", "aa?", "/;.,?", "も対応します/" ]
+            "aa,", "aa?", "/;.,?", "も対応します/", "#ping" ]
     ok.each do |display_name|
       user = users(:normal_user)
       user.display_name = display_name
@@ -92,17 +97,17 @@ class UserTest < Test::Unit::TestCase
       user = users(:normal_user)
       user.display_name = display_name
       assert !user.valid?, "#{display_name} is valid when it shouldn't be"
-      assert_equal "is invalid", user.errors.on(:display_name)
+      assert user.errors[:display_name].include?("is invalid")
     end
   end
   
   def test_friend_with
-    assert_equal true, users(:normal_user).is_friends_with?(users(:public_user))
-    assert_equal false, users(:normal_user).is_friends_with?(users(:inactive_user))
-    assert_equal false, users(:public_user).is_friends_with?(users(:normal_user))
-    assert_equal false, users(:public_user).is_friends_with?(users(:inactive_user))
-    assert_equal false, users(:inactive_user).is_friends_with?(users(:normal_user))
-    assert_equal false, users(:inactive_user).is_friends_with?(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))
+    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))
   end
   
   def test_users_nearby
@@ -127,14 +132,111 @@ class UserTest < Test::Unit::TestCase
     assert_equal [sec], norm.nearby
     assert_equal 1, norm.nearby.size
     assert_equal 1, Friend.count
-    assert_equal true, norm.is_friends_with?(sec)
-    assert_equal false, sec.is_friends_with?(norm)
-    assert_equal false, users(:normal_user).is_friends_with?(users(:inactive_user))
-    assert_equal false, users(:public_user).is_friends_with?(users(:normal_user))
-    assert_equal false, users(:public_user).is_friends_with?(users(:inactive_user))
-    assert_equal false, users(:inactive_user).is_friends_with?(users(:normal_user))
-    assert_equal false, users(:inactive_user).is_friends_with?(users(:public_user))
+    assert norm.is_friends_with?(sec)
+    assert !sec.is_friends_with?(norm)
+    assert !users(:normal_user).is_friends_with?(users(:inactive_user))
+    assert !users(:public_user).is_friends_with?(users(:normal_user))
+    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
   end
+
+  def test_user_preferred_editor
+    user = users(:normal_user)
+    assert_equal nil, user.preferred_editor
+    user.preferred_editor = "potlatch"
+    assert_equal "potlatch", user.preferred_editor
+    user.save!
+
+    user.preferred_editor = "invalid_editor"
+    assert_raise(ActiveRecord::RecordInvalid) { user.save! }
+  end
+
+  def test_visible
+    assert_equal 14, User.visible.count
+    assert_raise ActiveRecord::RecordNotFound do
+      User.visible.find(users(:suspended_user).id)
+    end
+    assert_raise ActiveRecord::RecordNotFound do
+      User.visible.find(users(:deleted_user).id)
+    end
+  end
+
+  def test_active
+    assert_equal 13, User.active.count
+    assert_raise ActiveRecord::RecordNotFound do
+      User.active.find(users(:inactive_user).id)
+    end
+    assert_raise ActiveRecord::RecordNotFound do
+      User.active.find(users(:suspended_user).id)
+    end
+    assert_raise ActiveRecord::RecordNotFound do
+      User.active.find(users(:deleted_user).id)
+    end
+  end
+
+  def test_public
+    assert_equal 15, User.public.count
+    assert_raise ActiveRecord::RecordNotFound do
+      User.public.find(users(:normal_user).id)
+    end
+  end
+
+  def test_languages
+    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 "de", user.preferred_language
+    assert_equal "de", user.preferred_language_from(["en", "sl", "de", "es"])
+  end
+
+  def test_visible?
+    assert_equal true, users(:inactive_user).visible?
+    assert_equal true, users(:normal_user).visible?
+    assert_equal true, users(:confirmed_user).visible?
+    assert_equal false, users(:suspended_user).visible?
+    assert_equal false, users(:deleted_user).visible?
+  end
+
+  def test_active?
+    assert_equal false, users(:inactive_user).active?
+    assert_equal true, users(:normal_user).active?
+    assert_equal true, users(:confirmed_user).active?
+    assert_equal false, users(:suspended_user).active?
+    assert_equal false, users(:deleted_user).active?
+  end
+
+  def test_moderator?
+    assert_equal false, users(:normal_user).moderator?
+    assert_equal true, users(:moderator_user).moderator?
+  end
+
+  def test_administrator?
+    assert_equal false, users(:normal_user).administrator?
+    assert_equal true, users(:administrator_user).administrator?
+  end
+
+  def test_has_role?
+    assert_equal false, users(:normal_user).has_role?("administrator")
+    assert_equal false, users(:normal_user).has_role?("moderator")
+    assert_equal true, users(:administrator_user).has_role?("administrator")
+    assert_equal true, users(:moderator_user).has_role?("moderator")
+  end
+
+  def test_delete
+    user = users(:normal_user)
+    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_equal false, user.image.file?
+    assert_equal "deleted", user.status
+    assert_equal false, user.visible?
+    assert_equal false, user.active?
+  end
 end