updated tests, switched to rails 3.0.0rc2

2010-08-26 14:36:02 -04:00
parent 694b6f0813
commit ad39553aac
48 changed files with 898 additions and 406 deletions
--- a/test/unit/current_user_test.rb
+++ b/test/unit/current_user_test.rb
@@ -11,8 +11,9 @@ class ArtistTest < ActiveSupport::TestCase
      CurrentUser.user = user
      CurrentUser.ip_addr = "1.2.3.4"
      
-      assert_equal(user.id, CurrentUser.current_user)
-      assert_equal("1.2.3.4", CurrentUser.current_ip_addr)
+      assert_not_nil(CurrentUser.user)
+      assert_equal(user.id, CurrentUser.user.id)
+      assert_equal("1.2.3.4", CurrentUser.ip_addr)
    end
  end
 end