X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9694b977d3b54f917006aa812d875fc277fde41d..959442d087b9b25fbec9c78ec122106b82d887dd:/test/unit/user_test.rb diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index 583b06e69..ac2bd5e71 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -1,8 +1,10 @@ +# -*- coding: utf-8 -*- require File.dirname(__FILE__) + '/../test_helper' -class UserTest < Test::Unit::TestCase - fixtures :users - +class UserTest < ActiveSupport::TestCase + api_fixtures + fixtures :friends + def test_invalid_with_empty_attributes user = User.new assert !user.valid? @@ -17,29 +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 } - bad = %w{ hi ht@ n@ @.com help@.me.uk help"hi.me.uk } + 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 ã対@å¿ãã¾ã + è¼è§¸ææçéæ²@ah.com ã対å¿ãã¾ã@s.name } ok.each do |name| user = users(:normal_user) @@ -63,6 +67,75 @@ class UserTest < Test::Unit::TestCase user.display_name = "" assert !user.valid? user.display_name = nil + # Don't understand why it isn't allowing a nil value, + # when the validates statements specifically allow it + # It appears the database does not allow null values assert !user.valid? end + + def test_display_name_valid + # 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", "