diff options
author | Azul <azul@leap.se> | 2012-11-12 19:16:55 +0100 |
---|---|---|
committer | Azul <azul@leap.se> | 2012-11-12 19:16:55 +0100 |
commit | c886cc17b6f37ddd556e70fe2d76a3ea28db52bf (patch) | |
tree | e27fe040bfaba5840730f466d4c6f90213759d5e /users/test/support | |
parent | ca2e1b9f379ccba068ad0ebb852d855f1639cd3a (diff) | |
parent | 5b300b554682c232c0955bdb0dd3d8263dde901e (diff) |
Merge branch 'feature-warden-srp' into develop
Diffstat (limited to 'users/test/support')
-rw-r--r-- | users/test/support/auth_test_helper.rb | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/users/test/support/auth_test_helper.rb b/users/test/support/auth_test_helper.rb index 9412058..f211597 100644 --- a/users/test/support/auth_test_helper.rb +++ b/users/test/support/auth_test_helper.rb @@ -1,17 +1,18 @@ module AuthTestHelper + extend ActiveSupport::Concern - def stub_logged_in - @user_id = stub - @user = stub - session[:user_id] = @user_id - User.expects(:find).once.with(@user_id).returns(@user) - return @user + # Controller will fetch current user from warden. + # Make it pick up our current_user + included do + setup do + request.env['warden'] ||= stub :user => nil + end end - def stub_logged_out - @user_id = stub - session[:user_id] = @user_id - User.expects(:find).once.with(@user_id).returns(nil) + def login(user = nil) + @current_user = user || stub + request.env['warden'] = stub :user => @current_user + return @current_user end def assert_access_denied(denied = true) |