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

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 02251b0ee..7d5f8dced 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -1,6 +1,7 @@
+# -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../test_helper'
 
-class UserTest < Test::Unit::TestCase
+class UserTest < ActiveSupport::TestCase
   api_fixtures
   fixtures :friends
 
@@ -18,31 +19,31 @@ class UserTest < Test::Unit::TestCase
   
   def test_unique_email
     new_user = User.new(:email => users(:normal_user).email,
-      :active => 1, 
+      :status => "active", 
       :pass_crypt => Digest::MD5.hexdigest('test'),
       :display_name => "new user",
       :data_public => 1,
       :description => "desc")
     assert !new_user.save
-    assert_equal ActiveRecord::Errors.default_error_messages[:taken], new_user.errors.on(:email)
+    assert_equal "has already been taken", new_user.errors.on(:email)
   end
   
   def test_unique_display_name
     new_user = User.new(:email => "tester@openstreetmap.org",
-      :active => 0,
+      :status => "pending",
       :pass_crypt => Digest::MD5.hexdigest('test'),
       :display_name => users(:normal_user).display_name, 
       :data_public => 1,
       :description => "desc")
     assert !new_user.save
-    assert_equal ActiveRecord::Errors.default_error_messages[:taken], new_user.errors.on(:display_name)
+    assert_equal "has already been taken", new_user.errors.on(:display_name)
   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)
@@ -137,4 +138,15 @@ class UserTest < Test::Unit::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
 end