Merged changes from jdong's branch into HEAD.

[selectricity] / lib / authenticated_test_helper.rb

diff --git a/lib/authenticated_test_helper.rb b/lib/authenticated_test_helper.rb
index a704035c023e2051f2978523225257f1d5e80bf3..83fc20cbcf5c7a4a8ccc1a66983d8e328b4ef686 100644 (file)
--- a/lib/authenticated_test_helper.rb
+++ b/lib/authenticated_test_helper.rb
@@ -1,7 +1,7 @@
 module AuthenticatedTestHelper
   # Sets the current user in the session from the user fixtures.
   def login_as(user)
 module AuthenticatedTestHelper
   # Sets the current user in the session from the user fixtures.
   def login_as(user)

-    @request.session[:user] = user ? users(user).id : nil
+    @request.session[:user_id] = user ? users(user).id : nil

   end
 
   def content_type(type)
   end
 
   def content_type(type)