Move vagrant provisioning script to a better location.

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

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 175d47e22e2172eccd7bd6a9a0b670fc4109f2a5..1a39309f1b60a798431b4c2e47dd64d938771f57 100644 (file)
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -109,7 +109,7 @@ class UserTest < ActiveSupport::TestCase
     assert !users(:inactive_user).is_friends_with?(users(:normal_user))
     assert !users(:inactive_user).is_friends_with?(users(:public_user))
   end
-  
+
   def test_users_nearby
     # second user has their data public and is close by normal user
     assert_equal [users(:public_user)], users(:normal_user).nearby
@@ -117,8 +117,10 @@ class UserTest < ActiveSupport::TestCase
     assert_equal [], users(:public_user).nearby
     # inactive_user has no user nearby
     assert_equal [], users(:inactive_user).nearby
+    # north_pole_user has no user nearby, and doesn't throw exception
+    assert_equal [], users(:north_pole_user).nearby
   end
-  
+
   def test_friends_with
     # normal user is a friend of second user
     # it should be a one way friend accossitation
@@ -155,7 +157,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_visible
-    assert_equal 14, User.visible.count
+    assert_equal 15, User.visible.count
     assert_raise ActiveRecord::RecordNotFound do
       User.visible.find(users(:suspended_user).id)
     end
@@ -165,7 +167,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_active
-    assert_equal 13, User.active.count
+    assert_equal 14, User.active.count
     assert_raise ActiveRecord::RecordNotFound do
       User.active.find(users(:inactive_user).id)
     end
@@ -178,7 +180,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_public
-    assert_equal 15, User.public.count
+    assert_equal 16, User.public.count
     assert_raise ActiveRecord::RecordNotFound do
       User.public.find(users(:normal_user).id)
     end
@@ -231,7 +233,7 @@ class UserTest < ActiveSupport::TestCase
     user = users(:normal_user)
     user.delete
     assert_equal "user_#{user.id}", user.display_name
-    assert_blank user.description
+    assert user.description.blank?
     assert_equal nil, user.home_lat
     assert_equal nil, user.home_lon
     assert_equal false, user.image.file?