diff options
author | Azul <azul@leap.se> | 2012-12-06 12:30:58 +0100 |
---|---|---|
committer | Azul <azul@leap.se> | 2012-12-06 12:30:58 +0100 |
commit | 2885145729cbba9a933a8a2ff33c4fd99f08e0fb (patch) | |
tree | d6c3cc84ef294c54c198b78b4e3e3e787735eb50 /users/test/support/auth_test_helper.rb | |
parent | ea3718c34cccd294865c0dd533db0b4aa18015cc (diff) | |
parent | 1b411de39f38eb0925cf255e941545933f227759 (diff) |
Merge branch 'feature/user-cancel-account' into develop
Diffstat (limited to 'users/test/support/auth_test_helper.rb')
-rw-r--r-- | users/test/support/auth_test_helper.rb | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/users/test/support/auth_test_helper.rb b/users/test/support/auth_test_helper.rb index e0b673a..f3506ae 100644 --- a/users/test/support/auth_test_helper.rb +++ b/users/test/support/auth_test_helper.rb @@ -10,8 +10,8 @@ module AuthTestHelper end end - def login(user_or_method_hash = nil) - @current_user = stub_user(user_or_method_hash) + def login(user_or_method_hash = {}) + @current_user = stub_record(User, user_or_method_hash) unless @current_user.respond_to? :is_admin? @current_user.stubs(:is_admin?).returns(false) end @@ -28,19 +28,6 @@ module AuthTestHelper end end - protected - - # Will create a stub user for logging in from either - # * a hash of methods to stub - # * a user record - # * nil -> create a user record stub - def stub_user(user_or_method_hash) - if user_or_method_hash.is_a?(Hash) - stub_record User, user_or_method_hash - else - user_or_method_hash || stub_record(User) - end - end end class ActionController::TestCase |