some tweaking to the user fixtures so that there is 2 near each other. new users...

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 89522ef7c457f3860d5bf01e7c485bbb0fcc082a..5a788c25c90951b98c7a2950610680d860511c05 100644 (file)
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -7,8 +7,8 @@ normal_user:
   display_name: test
   data_public: 0
   description: test
-  home_lat: 1
-  home_lon: 1
+  home_lat: 12.1
+  home_lon: 12.1
   home_zoom: 3
   
 second_user:
@@ -30,6 +30,6 @@ inactive_user:
   display_name: Inactive User
   data_public: 1
   description: description
-  home_lat: 12.34
+  home_lat: 123.4
   home_lon: 12.34
   home_zoom: 15

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index a8586280e31a8115045d0929b5a76303d86a7555..e12750a5f82c87cf5f5a99e0bafe191bedf26076 100644 (file)
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -99,4 +99,41 @@ class UserTest < Test::Unit::TestCase
     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
+  
+  def test_users_nearby
+    # second user has their data public and is close by normal user
+    assert_equal [users(:second_user)], users(:normal_user).nearby
+    # second_user has normal user nearby, but normal user has their data private
+    assert_equal [], users(:second_user).nearby
+    # inactive_user has no user nearby
+    assert_equal [], users(:inactive_user).nearby
+  end
+  
+  def test_friends_with
+    # make normal user a friend of second user
+    # it should be a one way friend accossitation
+    assert_equal 0, Friend.count
+    norm = users(:normal_user)
+    sec = users(:second_user)
+    friend = Friend.new
+    friend.user = norm
+    friend.friend_user_id = sec.id
+    friend.save
+    norm.clear_aggregation_cache
+    norm.clear_association_cache
+    sec.clear_aggregation_cache
+    sec.clear_association_cache
+    assert_equal [sec], norm.nearby
+    assert_equal 1, norm.nearby.size
+    assert_equal 1, Friend.count
+    assert_equal true, norm.is_friends_with?(sec)
+    assert_equal false, sec.is_friends_with?(norm)
+    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))
+    Friend.delete_all
+    assert_equal 0, Friend.count
+  end
 end