X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/98e11d164f6ae471c88c6f468eb1e3fe1a5cd69f..679e59210caf049bec515f9b7e6fdc6071b1a18a:/test/unit/user_test.rb

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 76c32a88d..bb17368b4 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -25,4 +25,38 @@ class UserTest < Test::Unit::TestCase
     assert !new_user.save
     assert_equal ActiveRecord::Errors.default_error_messages[:taken], new_user.errors.on(:email)
   end
+  
+  def test_unique_display_name
+    new_user = User.new(:email => "tester@openstreetmap.org",
+      :active => 0,
+      :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)
+  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 }
+    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
+    end
+    
+    bad.each do |name|
+      user = users(:normal_user)
+      user.email = name
+      assert !user.valid?, "#{name} is valid when it shouldn't be" 
+    end
+  end
+  
+  def test_display_name_length
+    user = users(:normal_user)
+    user.display_name = nil
+    asser user.valid, " should allow nil display name"
+  end
 end