diff options
| author | jessib <jessib@leap.se> | 2012-11-26 10:15:22 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2012-11-26 10:15:22 -0800 |
| commit | 3e744e4e226eae3ea2f900d9fccc32b6c046d65f (patch) | |
| tree | 1b19232d08229b178c094c92e2242ce1686099ae /users/test/support/auth_test_helper.rb | |
| parent | d9d67bd60d3fdfa4106977de9e5aba11f659fc79 (diff) | |
| parent | bf74255d1530fe5852dc6e6c27ef975ce9aa8d3c (diff) | |
Merge branch 'develop' into help_develop
Conflicts:
users/app/views/sessions/_nav.html.haml
Diffstat (limited to 'users/test/support/auth_test_helper.rb')
| -rw-r--r-- | users/test/support/auth_test_helper.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/users/test/support/auth_test_helper.rb b/users/test/support/auth_test_helper.rb index 795a977..ca166bf 100644 --- a/users/test/support/auth_test_helper.rb +++ b/users/test/support/auth_test_helper.rb @@ -11,6 +11,9 @@ module AuthTestHelper def login(user = nil) @current_user = user || stub + unless @current_user.respond_to? :is_admin? + @current_user.stubs(:is_admin?).returns(false) + end request.env['warden'] = stub :user => @current_user return @current_user end |