Use sign_in and authenticate methods.

test/controllers/filters_test.rb

@@ -54,12 +54,12 @@ class ControllerAuthenticableTest < ActionController::TestCase
 
   test 'proxy user_authenticate! to authenticate with user scope' do
     @mock_warden.expects(:authenticate!).with(:scope => :user)
-    @controller.sign_in_user!
+    @controller.authenticate_user!
   end
 
   test 'proxy admin_authenticate! to authenticate with admin scope' do
     @mock_warden.expects(:authenticate!).with(:scope => :admin)
-    @controller.sign_in_admin!
+    @controller.authenticate_admin!
   end
 
   test 'proxy user_authenticated? to authenticate with user scope' do
@@ -90,8 +90,7 @@ class ControllerAuthenticableTest < ActionController::TestCase
   end
 
   test 'sign in automatically proxy to set user on warden' do
-    user = OpenStruct.new
-    @mock_warden.expects(:set_user).with(user, :scope => :user).returns(true)
-    @controller.sign_in_automatically(user, :user)
+    @mock_warden.expects(:set_user).with(user = mock, :scope => :user).returns(true)
+    @controller.sign_in(:user, user)
   end
 end

test/rails_app/app/controllers/admins_controller.rb

@@ -1,5 +1,5 @@
 class AdminsController < ApplicationController
-  before_filter :sign_in_admin!
+  before_filter :authenticate_admin!
 
   def index
   end

test/rails_app/app/controllers/users_controller.rb

@@ -1,5 +1,5 @@
 class UsersController < ApplicationController
-  before_filter :sign_in_user!
+  before_filter :authenticate_user!
 
   def index
     user_session[:cart] = "Cart"