Use user models, not ids, in assertions

[rails.git] / test / models / user_test.rb

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 0e618cd22c86ec3058c0f699c6dfc1730a307bfc..96c6632ffcbcac8e9b85aadac8f91d2901d4cea7 100644 (file)
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -65,16 +65,13 @@ class UserTest < ActiveSupport::TestCase
   def test_display_name_length
     user = build(:user)
     user.display_name = "123"
   def test_display_name_length
     user = build(:user)
     user.display_name = "123"

-    assert user.valid?, " should allow nil display name"
+    assert user.valid?, "should allow 3 char name name"

     user.display_name = "12"
     assert_not user.valid?, "should not allow 2 char name"
     user.display_name = ""
     user.display_name = "12"
     assert_not user.valid?, "should not allow 2 char name"
     user.display_name = ""

-    assert_not user.valid?
+    assert_not user.valid?, "should not allow blank/0 char name"

     user.display_name = nil
     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_not user.valid?
+    assert_not user.valid?, "should not allow nil value"

   end
 
   def test_display_name_valid
   end
 
   def test_display_name_valid


@@ -82,14 +79,15 @@ class UserTest < ActiveSupport::TestCase
     # expact are allowed
     # However, would they affect the xml planet dumps?
     ok = ["Name", "'me", "he\"", "<hr>", "*ho", "\"help\"@",
     # expact are allowed
     # However, would they affect the xml planet dumps?
     ok = ["Name", "'me", "he\"", "<hr>", "*ho", "\"help\"@",

-          "vergrößern", "ルシステムにも対応します", "輕觸搖晃的遊戲"]
+          "vergrößern", "ルシステムにも対応します", "輕觸搖晃的遊戲", "space space"]

     # 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?", "/;.,?", "も対応します/", "#ping",
            "foo\x1fbar", "foo\x7fbar", "foo\ufffebar", "foo\uffffbar",
            "new", "terms", "save", "confirm", "confirm-email",
     # 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?", "/;.,?", "も対応します/", "#ping",
            "foo\x1fbar", "foo\x7fbar", "foo\ufffebar", "foo\uffffbar",
            "new", "terms", "save", "confirm", "confirm-email",

-           "go_public", "reset-password", "forgot-password", "suspended"]
+           "go_public", "reset-password", "forgot-password", "suspended",
+           "trailing whitespace ", " leading whitespace"]

     ok.each do |display_name|
       user = build(:user)
       user.display_name = display_name
     ok.each do |display_name|
       user = build(:user)
       user.display_name = display_name


@@ -107,7 +105,7 @@ class UserTest < ActiveSupport::TestCase
     alice = create(:user, :active)
     bob = create(:user, :active)
     charlie = create(:user, :active)
     alice = create(:user, :active)
     bob = create(:user, :active)
     charlie = create(:user, :active)

-    create(:friend, :befriender => alice, :befriendee => bob)
+    create(:friendship, :befriender => alice, :befriendee => bob)

 
     assert alice.is_friends_with?(bob)
     assert_not alice.is_friends_with?(charlie)
 
     assert alice.is_friends_with?(bob)
     assert_not alice.is_friends_with?(charlie)


@@ -138,16 +136,16 @@ class UserTest < ActiveSupport::TestCase
     assert_equal [], vagrant_user.nearby
   end
 
     assert_equal [], vagrant_user.nearby
   end
 

-  def test_friend_users
+  def test_friends

     norm = create(:user, :active)
     sec = create(:user, :active)
     norm = create(:user, :active)
     sec = create(:user, :active)

-    create(:friend, :befriender => norm, :befriendee => sec)
+    create(:friendship, :befriender => norm, :befriendee => sec)

 
 

-    assert_equal [sec], norm.friend_users
-    assert_equal 1, norm.friend_users.size
+    assert_equal [sec], norm.friends
+    assert_equal 1, norm.friends.size

 
 

-    assert_equal [], sec.friend_users
-    assert_equal 0, sec.friend_users.size
+    assert_equal [], sec.friends
+    assert_equal 0, sec.friends.size

   end
 
   def test_user_preferred_editor
   end
 
   def test_user_preferred_editor