diff options
author | jessib <jessib@leap.se> | 2013-01-14 11:50:54 -0800 |
---|---|---|
committer | jessib <jessib@leap.se> | 2013-01-14 11:50:54 -0800 |
commit | c2f232d994b3ee01ff9d50da1e4f3798df2136f3 (patch) | |
tree | 5b7a11e9aed58357d2a38b248b965cd936de6888 /users/test/support/auth_test_helper.rb | |
parent | d81bf00ecd8bdfcddf50e4881428c917253326fe (diff) | |
parent | ee2ea4ac8f4c6b0c3b09be6ed49e7a1faec7a9c1 (diff) |
Merge branch 'master' into feature/show_user. Added new tests.
Conflicts:
users/test/functional/users_controller_test.rb
Diffstat (limited to 'users/test/support/auth_test_helper.rb')
-rw-r--r-- | users/test/support/auth_test_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/users/test/support/auth_test_helper.rb b/users/test/support/auth_test_helper.rb index c9f5612..c0fcf3a 100644 --- a/users/test/support/auth_test_helper.rb +++ b/users/test/support/auth_test_helper.rb @@ -10,10 +10,10 @@ module AuthTestHelper end 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) + if user_or_method_hash.respond_to?(:reverse_merge) + user_or_method_hash.reverse_merge! :is_admin? => false end + @current_user = stub_record(:user, user_or_method_hash, true) request.env['warden'] = stub :user => @current_user return @current_user end |