From: Shaun McDonald <shaun@shaunmcdonald.me.uk>
Date: Thu, 17 Jul 2008 11:18:33 +0000 (+0000)
Subject: new friends with test. Fix to the display name valid tests to make sure that they... 
X-Git-Tag: live~7601^2~314
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0c3f15f5aa95d505ea4e220cb10bafd02752c021?hp=b931d6f516d049ac42fcd70f33f130c252f5d0a9

new friends with test. Fix to the display name valid tests to make sure that they don't test the length
---

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 489f76a1d..a8586280e 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -70,8 +70,13 @@ class UserTest < Test::Unit::TestCase
   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", "<hr>"]
-    bad = [ "<hr/>", "test@example.com", "s/f", "/", ";", ".", ",", "?", "/;.,?" ]
+    # 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?", "/;.,?" ]
     ok.each do |display_name|
       user = users(:normal_user)
       user.display_name = display_name
@@ -82,6 +87,16 @@ 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)
     end
   end
+  
+  def test_friend_with
+    assert_equal false, users(:normal_user).is_friends_with?(users(:second_user))
+    assert_equal false, users(:normal_user).is_friends_with?(users(:inactive_user))
+    assert_equal false, users(:second_user).is_friends_with?(users(:normal_user))
+    assert_equal false, users(:second_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(:second_user))
+  end
 end