Merge branch 'master' into openstreetbugs

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

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 587fc71fbf78aaaff4b8881b0cdc4ba623299d59..ac2bd5e7145997613879b21d3cf1dbc5439c761c 100644 (file)
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -1,8 +1,10 @@
+# -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../test_helper'
 
-class UserTest < Test::Unit::TestCase
-  fixtures :users
-  
+class UserTest < ActiveSupport::TestCase
+  api_fixtures
+  fixtures :friends
+
   def test_invalid_with_empty_attributes
     user = User.new
     assert !user.valid?
@@ -17,31 +19,31 @@ class UserTest < Test::Unit::TestCase
   
   def test_unique_email
     new_user = User.new(:email => users(:normal_user).email,
-      :active => 1, 
+      :status => "active", 
       :pass_crypt => Digest::MD5.hexdigest('test'),
       :display_name => "new user",
       :data_public => 1,
       :description => "desc")
     assert !new_user.save
-    assert_equal ActiveRecord::Errors.default_error_messages[:taken], new_user.errors.on(:email)
+    assert_equal "has already been taken", new_user.errors.on(:email)
   end
   
   def test_unique_display_name
     new_user = User.new(:email => "tester@openstreetmap.org",
-      :active => 0,
+      :status => "pending",
       :pass_crypt => Digest::MD5.hexdigest('test'),
       :display_name => users(:normal_user).display_name, 
       :data_public => 1,
       :description => "desc")
     assert !new_user.save
-    assert_equal ActiveRecord::Errors.default_error_messages[:taken], new_user.errors.on(:display_name)
+    assert_equal "has already been taken", new_user.errors.on(:display_name)
   end
   
   def test_email_valid
     ok = %w{ a@s.com test@shaunmcdonald.me.uk hello_local@ping-d.ng 
-    test_local@openstreetmap.org test-local@example.com
+    test_local@openstreetmap.org test-local@example.com }
+    bad = %w{ hi ht@ n@ @.com help@.me.uk help"hi.me.uk も対@応します
     輕觸搖晃的遊戲@ah.com も対応します@s.name }
-    bad = %w{ hi ht@ n@ @.com help@.me.uk help"hi.me.uk も対@応します }
     
     ok.each do |name|
       user = users(:normal_user)
@@ -96,44 +98,44 @@ class UserTest < Test::Unit::TestCase
   end
   
   def test_friend_with
-    assert_equal false, users(:normal_user).is_friends_with?(users(:second_user))
+    assert_equal true, users(:normal_user).is_friends_with?(users(:public_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(:public_user).is_friends_with?(users(:normal_user))
+    assert_equal false, users(:public_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))
+    assert_equal false, 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(:second_user)], users(:normal_user).nearby
+    assert_equal [users(:public_user)], users(:normal_user).nearby
     # second_user has normal user nearby, but normal user has their data private
-    assert_equal [], users(:second_user).nearby
+    assert_equal [], users(:public_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
+    # normal user is a friend of second user
     # it should be a one way friend accossitation
-    assert_equal 0, Friend.count
+    assert_equal 1, Friend.count
     norm = users(:normal_user)
-    sec = users(:second_user)
-    friend = Friend.new
-    friend.user = norm
-    friend.friend_user_id = sec.id
-    friend.save
+    sec = users(:public_user)
+    #friend = Friend.new
+    #friend.befriender = norm
+    #friend.befriendee = sec
+    #friend.save
     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(:public_user).is_friends_with?(users(:normal_user))
+    assert_equal false, users(:public_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(friend)
-    assert_equal 0, Friend.count
+    assert_equal false, users(:inactive_user).is_friends_with?(users(:public_user))
+    #Friend.delete(friend)
+    #assert_equal 0, Friend.count
   end
 end