diff options
| author | jessib <jessib@leap.se> | 2013-07-04 12:25:12 -0700 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-07-04 12:25:12 -0700 |
| commit | b1a7a700d214508bce1ddd13d80191c309ca17c5 (patch) | |
| tree | f72a10ee2596e0d6d0d4b57bb6cac0a317bc5553 /users | |
| parent | 6c413d3b0c4f9343fe35dbd6ad65b87dca4b4831 (diff) | |
| parent | d03e82b4df5075f796f56fb9568992b0ba0d7c07 (diff) | |
Merge branch 'master' into feature/disable_account
Diffstat (limited to 'users')
| -rw-r--r-- | users/test/functional/users_controller_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb index fd8869a..7f81c59 100644 --- a/users/test/functional/users_controller_test.rb +++ b/users/test/functional/users_controller_test.rb @@ -162,7 +162,7 @@ class UsersControllerTest < ActionController::TestCase delete :destroy, :id => @current_user.id assert_response :redirect - assert_redirected_to login_path + assert_redirected_to root_path end test "non-admin can't destroy user" do |