X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/20cc601f854d69596df6fe0ec9c6b957eb9dda6d..1e0bdda2f5ea1c8d401c7c92ac32acf2f9625ac2:/test/unit/user_test.rb?ds=inline

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index ac2bd5e71..9f04bd1d6 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -3,40 +3,44 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 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,
+    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"
+    }, :without_protection => true)
     assert !new_user.save
-    assert_equal "has already been 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",
+    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"
+    }, :without_protection => true)
     assert !new_user.save
-    assert_equal "has already been taken", new_user.errors.on(:display_name)
+    assert new_user.errors[:display_name].include?("has already been taken")
   end
   
   def test_email_valid
@@ -48,13 +52,13 @@ class UserTest < ActiveSupport::TestCase
     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
     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
   
@@ -93,7 +97,7 @@ class UserTest < ActiveSupport::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
   
@@ -138,4 +142,101 @@ class UserTest < ActiveSupport::TestCase
     #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_blank user.description
+    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