diff options
| author | Azul <azul@leap.se> | 2012-12-17 10:32:30 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-17 10:32:30 +0100 |
| commit | 13e68ed042d571d689918f081c105f4e394dbe93 (patch) | |
| tree | 258494b4233303afba3a18f44de6935cc1b2205e /users/test/support/auth_test_helper.rb | |
| parent | c9f3ddc9c1e4660ac86ec6ab33c927753a2f59bc (diff) | |
| parent | fa21fe9a5ba10f937cd21e83aa26a088f58e2e8a (diff) | |
Merge remote-tracking branch 'origin/master' into feature/clean-up-pjax-for-now
Diffstat (limited to 'users/test/support/auth_test_helper.rb')
| -rw-r--r-- | users/test/support/auth_test_helper.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/users/test/support/auth_test_helper.rb b/users/test/support/auth_test_helper.rb index 6a82f24..c9f5612 100644 --- a/users/test/support/auth_test_helper.rb +++ b/users/test/support/auth_test_helper.rb @@ -1,5 +1,4 @@ module AuthTestHelper - include StubRecordHelper extend ActiveSupport::Concern # Controller will fetch current user from warden. @@ -24,7 +23,7 @@ module AuthTestHelper assert_equal({:alert => "Not authorized"}, flash.to_hash) # todo: eventually probably eliminate separate conditions assert_redirected_to login_path if !logged_in - assert_redirected_to root_path if logged_in + assert_redirected_to root_path if logged_in else assert flash[:alert].blank? end |