JSON output, handle Accept header

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

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 584f5df0e97c989a2618f25280c16dc5e99ea8a4..2368960e163b2b1bf8d75d6823447d507524d0bf 100644 (file)
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -79,7 +79,7 @@ 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.",
     # 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.",


@@ -105,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)


@@ -136,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


@@ -263,7 +263,7 @@ class UserTest < ActiveSupport::TestCase
     assert user.description.blank?
     assert_nil user.home_lat
     assert_nil user.home_lon
     assert user.description.blank?
     assert_nil user.home_lat
     assert_nil user.home_lon

-    assert_equal false, user.image.file?
+    assert_equal false, user.avatar.attached?

     assert_equal "deleted", user.status
     assert_equal false, user.visible?
     assert_equal false, user.active?
     assert_equal "deleted", user.status
     assert_equal false, user.visible?
     assert_equal false, user.active?